diff options
| author | Masamitsu MURASE <[email protected]> | 2012-06-21 02:00:05 +0900 |
|---|---|---|
| committer | Masamitsu MURASE <[email protected]> | 2012-06-24 16:39:08 +0900 |
| commit | 2a2ffe7f7dc5202b29a1f59ab5e128b7040e0d86 (patch) | |
| tree | 0a7e145cca174c0b811e9e847a771a2a81e626e0 /include | |
| parent | 6d3b35e064ce46cc97530a4fc41e64e28c555c1a (diff) | |
| download | mruby-2a2ffe7f7dc5202b29a1f59ab5e128b7040e0d86.tar.gz mruby-2a2ffe7f7dc5202b29a1f59ab5e128b7040e0d86.zip | |
Modify Kernel#clone and Kernel#dup.
Kernel#clone, Kernel#dup:
- 'iv' should not be shared with the original object,
but it should be copied.
Kernel#clone:
- 'mt' of singleton_class should be copied.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/khash.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/mruby/khash.h b/include/mruby/khash.h index e236f0bea..0803521b7 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -61,6 +61,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; khint_t kh_put_##name(kh_##name##_t *h, khkey_t key); \ void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \ void kh_del_##name(kh_##name##_t *h, khint_t x); \ + kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h); /* define kh_xxx_funcs @@ -179,6 +180,20 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; { \ h->d_flags[x/8] |= __m[x%8]; \ h->size--; \ + } \ + kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h) \ + { \ + kh_##name##_t *h2; \ + khiter_t k, k2; \ + \ + h2 = kh_init_##name(mrb); \ + for (k = kh_begin(h); k != kh_end(h); k++) { \ + if (kh_exist(h, k)) { \ + k2 = kh_put_##name(h2, kh_key(h, k)); \ + kh_value(h2, k2) = kh_value(h, k); \ + } \ + } \ + return h2; \ } @@ -191,6 +206,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; #define kh_put(name, h, k) kh_put_##name(h, k) #define kh_get(name, h, k) kh_get_##name(h, k) #define kh_del(name, h, k) kh_del_##name(h, k) +#define kh_copy(name, mrb, h) kh_copy_##name(mrb, h) #define kh_exist(h, x) (!__ac_iseither((h)->e_flags, (h)->d_flags, (x))) #define kh_key(h, x) ((h)->keys[x]) |