From 5a37afe83ca14fe6e59dea1e67419915dd912c90 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 31 May 2011 02:12:14 +0000 Subject: [PATCH] Imported ext/-test-/string from trunk to ruby_1_9_2. Fixes #4540. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/-test-/string/extconf.rb | 6 ++++++ ext/-test-/string/init.c | 19 +++++++++++++++++++ ext/-test-/string/set_len.c | 14 ++++++++++++++ version.h | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ext/-test-/string/extconf.rb create mode 100644 ext/-test-/string/init.c create mode 100644 ext/-test-/string/set_len.c diff --git a/ext/-test-/string/extconf.rb b/ext/-test-/string/extconf.rb new file mode 100644 index 0000000000..42c10b994b --- /dev/null +++ b/ext/-test-/string/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-/string/string") diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c new file mode 100644 index 0000000000..793181d148 --- /dev/null +++ b/ext/-test-/string/init.c @@ -0,0 +1,19 @@ +#include "ruby.h" + +#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);} + +VALUE +bug_str_modify(VALUE str) +{ + rb_str_modify(str); + return str; +} + +void +Init_string(void) +{ + VALUE mBug = rb_define_module("Bug"); + VALUE klass = rb_define_class_under(mBug, "String", rb_cString); + rb_define_method(klass, "modify!", bug_str_modify, 0); + TEST_INIT_FUNCS(init); +} diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c new file mode 100644 index 0000000000..3c7d19d778 --- /dev/null +++ b/ext/-test-/string/set_len.c @@ -0,0 +1,14 @@ +#include "ruby.h" + +static VALUE +bug_str_set_len(VALUE str, VALUE len) +{ + rb_str_set_len(str, NUM2LONG(len)); + return str; +} + +void +Init_set_len(VALUE klass) +{ + rb_define_method(klass, "set_len", bug_str_set_len, 1); +} diff --git a/version.h b/version.h index bb85087dcd..c09d18b5fe 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 263 +#define RUBY_PATCHLEVEL 264 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1