From: Chris Hanson Date: Tue, 12 Oct 1993 22:19:14 +0000 (+0000) Subject: Change names: X-Git-Tag: 20090517-FFI~7774 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e7119ed4ee00f50817a5fc1f30ac4dd8d9559bb5;p=mit-scheme.git Change names: hash-table/strong-constructor => strong-hash-table/constructor hash-table/weak-constructor => weak-hash-table/constructor --- diff --git a/v7/src/runtime/hashtb.scm b/v7/src/runtime/hashtb.scm index 0164dc268..bbfd300dd 100644 --- a/v7/src/runtime/hashtb.scm +++ b/v7/src/runtime/hashtb.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: hashtb.scm,v 1.11 1993/10/11 10:59:38 cph Exp $ +$Id: hashtb.scm,v 1.12 1993/10/12 22:19:02 cph Exp $ Copyright (c) 1990-93 Massachusetts Institute of Technology @@ -158,10 +158,10 @@ MIT in each case. |# (define (strong-cdr entry) (cdr entry)) (define (strong-set-cdr! entry datum) (set-cdr! entry datum)) -(define (hash-table/strong-constructor key-hash key=?) +(define (strong-hash-table/constructor key-hash key=?) (hash-table/constructor key-hash key=? cons #t car cdr set-cdr!)) -(define (hash-table/weak-constructor key-hash key=?) +(define (weak-hash-table/constructor key-hash key=?) (hash-table/constructor key-hash key=? weak-cons weak-pair/car? weak-car weak-cdr weak-set-cdr!)) @@ -769,7 +769,7 @@ MIT in each case. |# (define (initialize-package!) (set! address-hash-tables '()) (add-primitive-gc-daemon! mark-address-hash-tables!) - (set! make-eq-hash-table (hash-table/weak-constructor eq-hash eq?)) + (set! make-eq-hash-table (weak-hash-table/constructor eq-hash eq?)) ;; EQV? hash tables are weak except for numbers and #F. It's ;; important to keep numbers in the table, and handling #F specially ;; makes it easier to deal with weak pairs. @@ -792,11 +792,11 @@ MIT in each case. |# (lambda (entry datum) (system-pair-set-cdr! entry datum)))) (set! make-equal-hash-table - (hash-table/strong-constructor equal-hash equal?)) + (strong-hash-table/constructor equal-hash equal?)) (set! make-symbol-hash-table make-eq-hash-table) (set! make-object-hash-table make-eqv-hash-table) (set! make-string-hash-table - (hash-table/strong-constructor string-hash-mod string=?)) + (strong-hash-table/constructor string-hash-mod string=?)) unspecific) (define (check-arg object default predicate description procedure) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index 36fe614ae..1c3828277 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.202 1993/10/10 10:08:20 cph Exp $ +$Id: runtime.pkg,v 14.203 1993/10/12 22:19:14 cph Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -886,8 +886,6 @@ MIT in each case. |# hash-table/set-entry-datum! hash-table/set-entry-value! hash-table/size - hash-table/strong-constructor - hash-table/weak-constructor hash-table? make-eq-hash-table make-equal-hash-table @@ -896,7 +894,9 @@ MIT in each case. |# make-string-hash-table make-symbol-hash-table set-hash-table/rehash-size! - set-hash-table/rehash-threshold!) + set-hash-table/rehash-threshold! + strong-hash-table/constructor + weak-hash-table/constructor) (initialization (initialize-package!))) (define-package (runtime history) diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg index 36fe614ae..1c3828277 100644 --- a/v8/src/runtime/runtime.pkg +++ b/v8/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.202 1993/10/10 10:08:20 cph Exp $ +$Id: runtime.pkg,v 14.203 1993/10/12 22:19:14 cph Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -886,8 +886,6 @@ MIT in each case. |# hash-table/set-entry-datum! hash-table/set-entry-value! hash-table/size - hash-table/strong-constructor - hash-table/weak-constructor hash-table? make-eq-hash-table make-equal-hash-table @@ -896,7 +894,9 @@ MIT in each case. |# make-string-hash-table make-symbol-hash-table set-hash-table/rehash-size! - set-hash-table/rehash-threshold!) + set-hash-table/rehash-threshold! + strong-hash-table/constructor + weak-hash-table/constructor) (initialization (initialize-package!))) (define-package (runtime history)