From f45fc7daa00faa561c1bce32b598c06e1ec0d978 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 10 Apr 2012 10:07:07 +0000 Subject: * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ error.c | 13 +++++++++++++ ext/-test-/exception/enc_raise.c | 14 ++++++++++++++ ext/-test-/exception/extconf.rb | 6 ++++++ ext/-test-/exception/init.c | 11 +++++++++++ include/ruby/encoding.h | 2 ++ test/-ext-/exception/test_enc_raise.rb | 15 +++++++++++++++ 7 files changed, 67 insertions(+) create mode 100644 ext/-test-/exception/enc_raise.c create mode 100644 ext/-test-/exception/extconf.rb create mode 100644 ext/-test-/exception/init.c create mode 100644 test/-ext-/exception/test_enc_raise.rb diff --git a/ChangeLog b/ChangeLog index 66101c1d1b..c21d26c22a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 10 19:07:04 2012 Nobuyoshi Nakada + + * 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 * lib/net/http.rb (Net::HTTP#send_request_with_body_stream): diff --git a/error.c b/error.c index 0562de5d84..84286cfcec 100644 --- a/error.c +++ b/error.c @@ -1728,6 +1728,19 @@ Init_Exception(void) rb_define_global_function("warn", rb_warn_m, -1); } +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, ...) { diff --git a/ext/-test-/exception/enc_raise.c b/ext/-test-/exception/enc_raise.c new file mode 100644 index 0000000000..25410df205 --- /dev/null +++ b/ext/-test-/exception/enc_raise.c @@ -0,0 +1,14 @@ +#include +#include + +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); +} diff --git a/ext/-test-/exception/extconf.rb b/ext/-test-/exception/extconf.rb new file mode 100644 index 0000000000..0faf6d53ed --- /dev/null +++ b/ext/-test-/exception/extconf.rb @@ -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") diff --git a/ext/-test-/exception/init.c b/ext/-test-/exception/init.c new file mode 100644 index 0000000000..853bb68f79 --- /dev/null +++ b/ext/-test-/exception/init.c @@ -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); +} diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index ad2b614cd2..b4e66c1dc4 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -112,6 +112,8 @@ VALUE rb_str_export_to_enc(VALUE, rb_encoding *); 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); diff --git a/test/-ext-/exception/test_enc_raise.rb b/test/-ext-/exception/test_enc_raise.rb new file mode 100644 index 0000000000..a578b167ea --- /dev/null +++ b/test/-ext-/exception/test_enc_raise.rb @@ -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 -- cgit v1.2.3