diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-25 14:45:54 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-25 14:45:54 +0000 |
commit | a486583503f13062072b261a03f82791d5c52cd0 (patch) | |
tree | 2f06fa340416cb387ba86a437ac3a61d9c9f7dea /marshal.c | |
parent | 78ef4198f400cd2c6ddd28353531aaba996b6697 (diff) | |
download | ruby-a486583503f13062072b261a03f82791d5c52cd0.tar.gz ruby-a486583503f13062072b261a03f82791d5c52cd0.tar.xz ruby-a486583503f13062072b261a03f82791d5c52cd0.zip |
merges r25411 from trunk into ruby_1_9_1.
--
* marshal.c (w_symbol, r_symreal): fixed the order of symbol and
its encoding modifier, in order to make the dump readable from
1.8. [ruby-dev:39515]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -412,13 +412,13 @@ w_symbol(ID id, struct dump_arg *arg) } w_byte(TYPE_SYMBOL, arg); w_bytes(RSTRING_PTR(sym), RSTRING_LEN(sym), arg); + st_add_direct(arg->symbols, id, arg->symbols->num_entries); if (encidx != -1) { struct dump_call_arg c_arg; c_arg.limit = 1; c_arg.arg = arg; w_encoding(sym, 0, &c_arg); } - st_add_direct(arg->symbols, id, arg->symbols->num_entries); } } @@ -1095,7 +1095,9 @@ r_symreal(struct load_arg *arg, int ivar) volatile VALUE s = r_bytes(arg); ID id; int idx = -1; + st_index_t n = arg->symbols->num_entries; + st_insert(arg->symbols, (st_data_t)n, (st_data_t)0); if (ivar) { long num = r_long(arg); while (num-- > 0) { @@ -1106,7 +1108,7 @@ r_symreal(struct load_arg *arg, int ivar) if (idx < 0) idx = rb_usascii_encindex(); rb_enc_associate_index(s, idx); id = rb_intern_str(s); - st_insert(arg->symbols, arg->symbols->num_entries, id); + st_insert(arg->symbols, (st_data_t)n, (st_data_t)id); return id; } |