summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-20 04:29:58 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-20 04:29:58 +0000
commitc7868668121470b56f173a596b750e8a27fe9e18 (patch)
tree96b130e912efefc888dd4f84dc35ca5de9077776 /marshal.c
parent772ed5507e569d7697841492a37d7607adbc9385 (diff)
* 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
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/marshal.c b/marshal.c
index 97cc868..297be75 100644
--- a/marshal.c
+++ b/marshal.c
@@ -293,7 +293,7 @@ w_object(obj, arg, limit)
w_byte(TYPE_FIXNUM, arg);
w_long(FIX2INT(obj), arg);
#else
- if (RSHIFT((long)obj, 32) == 0 || RSHIFT((long)obj, 32) == -1) {
+ if (RSHIFT((long)obj, 30) == 0 || RSHIFT((long)obj, 30) == -1) {
w_byte(TYPE_FIXNUM, arg);
w_long(FIX2LONG(obj), arg);
}
@@ -447,13 +447,12 @@ w_object(obj, arg, limit)
w_byte(TYPE_STRUCT, arg);
{
long len = RSTRUCT(obj)->len;
- char *path = rb_class2name(CLASS_OF(obj));
VALUE mem;
long i;
- w_unique(path, arg);
+ w_unique(rb_class2name(CLASS_OF(obj)), arg);
w_long(len, arg);
- mem = rb_ivar_get(CLASS_OF(obj), rb_intern("__member__"));
+ mem = rb_ivar_get(rb_obj_class(obj), rb_intern("__member__"));
if (mem == Qnil) {
rb_raise(rb_eTypeError, "uninitialized struct");
}