From bc2df4136536496e72a8bbdf14a8980f65b259b8 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 17 Jul 2009 09:28:46 +0000 Subject: * range.c (recursive_hash): extracted from range_hash. reject recursive key. (range_hash): use recursive_hash. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ range.c | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42ee98d735..3ae5339e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 17 18:18:23 2009 Tanaka Akira + + * range.c (recursive_hash): extracted from range_hash. reject + recursive key. + (range_hash): use recursive_hash. + Fri Jul 17 18:11:32 2009 Tanaka Akira * struct.c (recursive_hash): extracted from rb_struct_hash. reject diff --git a/range.c b/range.c index ce2df63100..e013a8a13f 100644 --- a/range.c +++ b/range.c @@ -201,21 +201,15 @@ range_eql(VALUE range, VALUE obj) return Qtrue; } -/* - * call-seq: - * rng.hash => fixnum - * - * Generate a hash value such that two ranges with the same start and - * end points, and the same value for the "exclude end" flag, generate - * the same hash value. - */ - static VALUE -range_hash(VALUE range) +recursive_hash(VALUE range, VALUE dummy, int recur) { unsigned long hash = EXCL(range); VALUE v; + if (recur) { + rb_raise(rb_eArgError, "recursive key for hash"); + } hash = rb_hash_start(hash); v = rb_hash(RANGE_BEG(range)); hash = rb_hash_uint(hash, NUM2LONG(v)); @@ -227,6 +221,21 @@ range_hash(VALUE range) return LONG2FIX(hash); } +/* + * call-seq: + * rng.hash => fixnum + * + * Generate a hash value such that two ranges with the same start and + * end points, and the same value for the "exclude end" flag, generate + * the same hash value. + */ + +static VALUE +range_hash(VALUE range) +{ + return rb_exec_recursive(recursive_hash, range, 0); +} + static void range_each_func(VALUE range, VALUE (*func) (VALUE, void *), void *arg) { -- cgit v1.2.3