summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-05 15:31:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-05 15:31:42 +0000
commit79cdf2ffa201b3b9f1108d77231a7adae2c4e3bb (patch)
treecf4f3b7def41d8f798af09d200dd52c180df9908
parentfff981ee6de1c91392105aeef60bd17f2b88af70 (diff)
* struct.c (make_struct): preserve encoding of struct name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--struct.c8
-rw-r--r--version.h6
3 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b9029ec63..a5a977c09c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 6 00:31:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * struct.c (make_struct): preserve encoding of struct name.
+
Wed Mar 05 22:49:20 2008 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (is_utf8_lead_byte, count_utf8_lead_bytes_with_ulong):
diff --git a/struct.c b/struct.c
index 1c7ec1a6b0..a8857ffe92 100644
--- a/struct.c
+++ b/struct.c
@@ -181,14 +181,12 @@ make_struct(VALUE name, VALUE members, VALUE klass)
rb_class_inherited(klass, nstr);
}
else {
- char *cname = StringValuePtr(name);
-
- id = rb_intern(cname);
+ id = SYM2ID(rb_str_intern(name));
if (!rb_is_const_id(id)) {
- rb_name_error(id, "identifier %s needs to be constant", cname);
+ rb_name_error(id, "identifier %s needs to be constant", StringValuePtr(name));
}
if (rb_const_defined_at(klass, id)) {
- rb_warn("redefining constant Struct::%s", cname);
+ rb_warn("redefining constant Struct::%s", StringValuePtr(name));
rb_mod_remove_const(klass, ID2SYM(id));
}
nstr = rb_define_class_under(klass, rb_id2name(id), klass);
diff --git a/version.h b/version.h
index c2532b5a6f..726cffce95 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-03-05"
+#define RUBY_RELEASE_DATE "2008-03-06"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080305
+#define RUBY_RELEASE_CODE 20080306
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];