* range.c (range_step): 'iter' here should be an array.

* marshal.c (w_object): should retrieve __member__ data from
  non-singleton class.

* variable.c (rb_cvar_get): class variable override check added.

* variable.c (rb_cvar_set): ditto

* variable.c (rb_cvar_declare): ditto.

* parse.y (parse_regx): handle backslash escaping of delimiter here.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/string.c b/string.c
index c80f356b37..45f768c53d 100644
--- a/string.c
+++ b/string.c
@@ -100,7 +100,7 @@ rb_str_new4(orig)
 {
     VALUE klass;
 
-    klass = rb_obj_type(orig);
+    klass = rb_obj_class(orig);
     if (RSTRING(orig)->orig) {
 	VALUE str;
 
@@ -257,7 +257,7 @@ rb_str_dup(str)
     VALUE klass;
 
     StringValue(str);
-    klass = rb_obj_type(str);
+    klass = rb_obj_class(str);
 
     if (OBJ_FROZEN(str)) str2 = rb_str_new3(str);
     else if (FL_TEST(str, STR_NO_ORIG)) {