diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | hash.c | 11 | ||||
| -rw-r--r-- | include/ruby/intern.h | 1 | ||||
| -rw-r--r-- | insnhelper.ci | 2 |
4 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Tue Jul 10 19:34:45 2007 Koichi Sasada <ko1@atdot.net> + + * hash.c (rb_hash_lookup): added. this function is similar to + rb_hash_aref(), but doesn't call Hash#default when no entry + exists. + + * include/ruby/intern.h: ditto. + + * insnhelper.ci (lfp_svar_get): use rb_hash_lookup(). + Tue Jul 10 19:16:28 2007 Koichi Sasada <ko1@atdot.net> * eval.c, insnhelper.ci, vm.c: change cref index (-1 -> 2). @@ -401,6 +401,17 @@ rb_hash_aref(VALUE hash, VALUE key) return val; } +VALUE +rb_hash_lookup(VALUE hash, VALUE key) +{ + VALUE val; + + if (!st_lookup(RHASH(hash)->tbl, key, &val)) { + return Qnil; /* without Hash#default */ + } + return val; +} + /* * call-seq: * hsh.fetch(key [, default] ) => obj diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 1e45f2d977..9d8034a333 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -329,6 +329,7 @@ VALUE rb_hash(VALUE); VALUE rb_hash_new(void); VALUE rb_hash_freeze(VALUE); VALUE rb_hash_aref(VALUE, VALUE); +VALUE rb_hash_lookup(VALUE, VALUE); VALUE rb_hash_aset(VALUE, VALUE, VALUE); VALUE rb_hash_delete_if(VALUE); VALUE rb_hash_delete(VALUE,VALUE); diff --git a/insnhelper.ci b/insnhelper.ci index 7df4ef8fa2..c3c44cba28 100644 --- a/insnhelper.ci +++ b/insnhelper.ci @@ -788,7 +788,7 @@ lfp_svar_get(rb_thread_t *th, VALUE *lfp, VALUE key) return Qnil; } else { - return rb_hash_aref(hash, key); + return rb_hash_lookup(hash, key); } } } |