diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-02 21:47:27 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-02 21:47:27 +0900 |
| commit | 110cdd82e025999e07a448577cc5191aed113ac8 (patch) | |
| tree | b7333760e52a7923999823cf7acff16641a9ac71 /src/hash.c | |
| parent | de133c37154fc2d433961ab900411b3c8cd23bef (diff) | |
| download | mruby-110cdd82e025999e07a448577cc5191aed113ac8.tar.gz mruby-110cdd82e025999e07a448577cc5191aed113ac8.zip | |
naming convention consistency for hash.h
Diffstat (limited to 'src/hash.c')
| -rw-r--r-- | src/hash.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/hash.c b/src/hash.c index 6c19919e5..6d176e80c 100644 --- a/src/hash.c +++ b/src/hash.c @@ -101,7 +101,7 @@ mrb_hash_new(mrb_state *mrb) } mrb_value -mrb_hash_get(mrb_state *mrb, mrb_value hash, mrb_value key) /* mrb_hash_aref */ /* mrb_hash_lookup */ +mrb_hash_get(mrb_state *mrb, mrb_value hash, mrb_value key) { khash_t(ht) *h = RHASH_TBL(hash); khiter_t k; @@ -118,13 +118,13 @@ mrb_hash_get(mrb_state *mrb, mrb_value hash, mrb_value key) /* mrb_hash_aref */ } mrb_value -mrb_hash_getWithDef(mrb_state *mrb, mrb_value hash, mrb_value vkey, mrb_value def) /* mrb_hash_lookup2 */ +mrb_hash_fetch(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value def) { khash_t(ht) *h = RHASH_TBL(hash); khiter_t k; if (h) { - k = kh_get(ht, h, vkey); + k = kh_get(ht, h, key); if (k != kh_end(h)) return kh_value(h, k); } @@ -333,15 +333,9 @@ mrb_hash_aget(mrb_state *mrb, mrb_value self) } mrb_value -mrb_hash_lookup2(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value def) -{ - return mrb_hash_getWithDef(mrb, hash, key, def); -} - -mrb_value mrb_hash_lookup(mrb_state *mrb, mrb_value hash, mrb_value key) { - return mrb_hash_lookup2(mrb, hash, key, mrb_nil_value()); + return mrb_hash_get(mrb, hash, key); } /* |
