summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rw-r--r--oop/ChangeLog7
-rw-r--r--oop/goops/dispatch.scm6
3 files changed, 10 insertions, 4 deletions
diff --git a/THANKS b/THANKS
index 7b52701e5..3294a79b6 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ For fixes or providing information which led to a fix:
Ron Peterson
David Pirotte
Ken Raeburn
+ Andreas Rottmann
Kevin Ryde
Bill Schottstaedt
Greg Troxel
diff --git a/oop/ChangeLog b/oop/ChangeLog
index 3bbae6e20..3e1f19c8a 100644
--- a/oop/ChangeLog
+++ b/oop/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-19 Mikael Djurfeldt <djurfeldt@nada.kth.se>
+
+ * goops/dispatch.scm (cache-hashval): Corrected termination
+ condition for hashval computation. (Previously, it made erroneous
+ assumptions about the representation of environments; Thanks to
+ Andreas Rottmann.)
+
2003-04-17 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* goops.scm (compute-getters-n-setters): Check for bad init-thunk.
diff --git a/oop/goops/dispatch.scm b/oop/goops/dispatch.scm
index 025b07c8c..5af05cff1 100644
--- a/oop/goops/dispatch.scm
+++ b/oop/goops/dispatch.scm
@@ -1,4 +1,4 @@
-;;;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -172,13 +172,11 @@
;;; Caching
;;;
-(define environment? pair?)
-
(define (cache-hashval hashset entry)
(let ((hashset-index (+ hashset-index hashset)))
(do ((sum 0)
(classes entry (cdr classes)))
- ((environment? (car classes)) sum)
+ ((not (struct? (car classes))) sum)
(set! sum (+ sum (struct-ref (car classes) hashset-index))))))
(define (cache-try-hash! min-misses hashset cache entries)