From 93491caec90ac4935dc14ae318d45ac50ea177c2 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 10 Apr 2014 00:57:21 +0900 Subject: revert b45e99 since a bug in khash.h was fixed --- src/class.c | 10 ++-------- src/variable.c | 5 +---- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/class.c b/src/class.c index 4c39aed9a..656120845 100644 --- a/src/class.c +++ b/src/class.c @@ -313,10 +313,7 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, struct RPro khiter_t k; if (!h) h = c->mt = kh_init(mt, mrb); - k = kh_get(mt, mrb, h, mid); - if (k == kh_end(h)) { - k = kh_put(mt, mrb, h, mid); - } + k = kh_put(mt, mrb, h, mid); kh_value(h, k) = p; if (p) { mrb_field_write_barrier(mrb, (struct RBasic *)c, (struct RBasic *)p); @@ -349,10 +346,7 @@ mrb_define_method_vm(mrb_state *mrb, struct RClass *c, mrb_sym name, mrb_value b struct RProc *p; if (!h) h = c->mt = kh_init(mt, mrb); - k = kh_get(mt, mrb, h, name); - if (k == kh_end(h)) { - k = kh_put(mt, mrb, h, name); - } + k = kh_put(mt, mrb, h, name); p = mrb_proc_ptr(body); kh_value(h, k) = p; if (p) { diff --git a/src/variable.c b/src/variable.c index 77d701401..3dcdbf775 100644 --- a/src/variable.c +++ b/src/variable.c @@ -308,10 +308,7 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val) khash_t(iv) *h = &t->h; khiter_t k; - k = kh_get(iv, mrb, h, sym); - if (k == kh_end(h)) { - k = kh_put(iv, mrb, h, sym); - } + k = kh_put(iv, mrb, h, sym); kh_value(h, k) = val; } -- cgit v1.2.3