summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/digest/digest.c12
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cfe09c4656..98b586d0b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 1 03:42:09 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
+ Digest::Base subclasses, which was unintentionally made
+ impossible while restructuring Digest classes.
+
Wed Feb 28 22:10:55 2007 Akinori MUSHA <knu@iDaemons.org>
* doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 07484f897f..92a925c616 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -423,15 +423,19 @@ rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
static rb_digest_metadata_t *
get_digest_base_metadata(VALUE klass)
{
+ VALUE p;
VALUE obj;
rb_digest_metadata_t *algo;
- if (rb_ivar_defined(klass, id_metadata) == Qfalse) {
- /* This class should not be subclassed in Ruby */
- rb_notimplement();
+ for (p = klass; p; p = RCLASS(p)->super) {
+ if (rb_ivar_defined(p, id_metadata)) {
+ obj = rb_ivar_get(p, id_metadata);
+ break;
+ }
}
- obj = rb_ivar_get(klass, id_metadata);
+ if (!p)
+ rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
Data_Get_Struct(obj, rb_digest_metadata_t, algo);