From efa92c86a5bca0de3e722aa77afa62beced5e9c4 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 4 Mar 2009 09:19:45 +0000 Subject: merges r22662 from trunk into ruby_1_9_1. -- * compile.c (cdhash_type, iseq_set_sequence): should not call methods of the argument of case, to keep the semantics of case/when. [ruby-dev:38079] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'compile.c') diff --git a/compile.c b/compile.c index bca3f75ed6..d9f3731c3e 100644 --- a/compile.c +++ b/compile.c @@ -1216,6 +1216,38 @@ iseq_set_local_table(rb_iseq_t *iseq, ID *tbl) return COMPILE_OK; } +static int +cdhash_cmp(VALUE val, VALUE lit) +{ + if (val == lit) return 0; + if (SPECIAL_CONST_P(lit)) { + return val != lit; + } + if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) { + return -1; + } + if (BUILTIN_TYPE(lit) == T_STRING) { + return rb_str_hash_cmp(lit, val); + } + return !rb_eql(lit, val); +} + +static int +cdhash_hash(VALUE a) +{ + if (SPECIAL_CONST_P(a)) return (int)a; + if (TYPE(a) == T_STRING) return rb_str_hash(a); + { + VALUE hval = rb_hash(a); + return (int)FIX2LONG(hval); + } +} + +static const struct st_hash_type cdhash_type = { + cdhash_cmp, + cdhash_hash, +}; + /** ruby insn object array -> raw instruction sequence */ @@ -1343,6 +1375,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) int i; VALUE lits = operands[j]; VALUE map = rb_hash_new(); + RHASH_TBL(map)->type = &cdhash_type; for (i=0; i < RARRAY_LEN(lits); i+=2) { VALUE obj = rb_ary_entry(lits, i); -- cgit v1.2.3