diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-23 11:08:18 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-23 11:08:18 +0900 |
| commit | 04d9c5ea6bfbdaf425526cf3556704f6b9fd0971 (patch) | |
| tree | c1659854546676c402a25679b8236ec467a6ef3d /src/hash.c | |
| parent | d04f6abb00051465f59be4cda54e593a64923f8e (diff) | |
| parent | fc63ef150b029fcd5c73a0b9fde60d44a4a1d662 (diff) | |
| download | mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.tar.gz mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.zip | |
resolve conflict regarding backtick
Diffstat (limited to 'src/hash.c')
| -rw-r--r-- | src/hash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/hash.c b/src/hash.c index dc00c0db5..74474df95 100644 --- a/src/hash.c +++ b/src/hash.c @@ -262,7 +262,7 @@ mrb_hash_init_core(mrb_state *mrb, mrb_value hash) RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT; ifnone = block; } - mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone); + mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone); return hash; } @@ -427,7 +427,7 @@ mrb_hash_set_default(mrb_state *mrb, mrb_value hash) mrb_get_args(mrb, "o", &ifnone); mrb_hash_modify(mrb, hash); - mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone); + mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone); RHASH(hash)->flags &= ~(MRB_HASH_PROC_DEFAULT); return ifnone; @@ -478,7 +478,7 @@ mrb_hash_set_default_proc(mrb_state *mrb, mrb_value hash) mrb_get_args(mrb, "o", &ifnone); mrb_hash_modify(mrb, hash); - mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone); + mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone); RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT; return ifnone; @@ -759,7 +759,7 @@ mrb_hash_replace(mrb_state *mrb, mrb_value hash) else { ifnone = RHASH_IFNONE(hash2); } - mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone); + mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone); return hash; } @@ -1104,7 +1104,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql) if (mrb_obj_equal(mrb, hash1, hash2)) return mrb_true_value(); if (!mrb_hash_p(hash2)) { - if (!mrb_respond_to(mrb, hash2, mrb_intern(mrb, "to_hash"))) { + if (!mrb_respond_to(mrb, hash2, mrb_intern2(mrb, "to_hash", 7))) { return mrb_false_value(); } if (eql) |