From 89937fd860c92ae28cb3760770ba3dd39c1ff727 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 26 Apr 2018 00:03:07 -0700 Subject: [PATCH] Eliminate now-deprecated references to hash-table procedures. --- src/edwin/comman.scm | 2 +- src/edwin/curren.scm | 2 +- src/edwin/eystep.scm | 4 ++-- src/edwin/prompt.scm | 2 +- src/edwin/xterm.scm | 4 ++-- src/imail/imail-core.scm | 2 +- src/ssp/xmlrpc.scm | 2 +- src/x11-screen/x11-screen.scm | 4 ++-- src/xdoc/xdoc.scm | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/edwin/comman.scm b/src/edwin/comman.scm index 70b1bcb63..345ca6e7e 100644 --- a/src/edwin/comman.scm +++ b/src/edwin/comman.scm @@ -203,4 +203,4 @@ USA. (hash-table-ref/default permanent-local-variables variable #f)) (define permanent-local-variables - (make-weak-eq-hash-table)) \ No newline at end of file + (make-key-weak-eq-hash-table)) \ No newline at end of file diff --git a/src/edwin/curren.scm b/src/edwin/curren.scm index 6fdc004cd..91a08cc7a 100644 --- a/src/edwin/curren.scm +++ b/src/edwin/curren.scm @@ -622,7 +622,7 @@ The buffer is guaranteed to be selected at that time." (add-event-receiver! editor-initializations (lambda () - (set! screen-buffer-layouts (make-weak-eq-hash-table)) + (set! screen-buffer-layouts (make-key-weak-eq-hash-table)) unspecific)) ;;;; Point diff --git a/src/edwin/eystep.scm b/src/edwin/eystep.scm index 90a8ee6c1..323904f9f 100644 --- a/src/edwin/eystep.scm +++ b/src/edwin/eystep.scm @@ -172,7 +172,7 @@ c contract the step under the cursor") (get-stepper-buffer state))) (define stepper-buffers - (make-weak-eq-hash-table)) + (make-key-weak-eq-hash-table)) (define (current-stepper-state) (buffer->stepper-state (current-buffer))) @@ -193,7 +193,7 @@ c contract the step under the cursor") (define (get-buffer-ynode-regions buffer) (or (buffer-get buffer 'YNODE-REGIONS) - (let ((table (make-weak-eq-hash-table))) + (let ((table (make-key-weak-eq-hash-table))) (buffer-put! buffer 'YNODE-REGIONS table) table))) diff --git a/src/edwin/prompt.scm b/src/edwin/prompt.scm index d935f3b3a..946cf374c 100644 --- a/src/edwin/prompt.scm +++ b/src/edwin/prompt.scm @@ -45,7 +45,7 @@ USA. (set! typein-saved-windows '()) (set! map-name/internal->external identity-procedure) (set! map-name/external->internal identity-procedure) - (set! prompt-histories (make-weak-eq-hash-table)) + (set! prompt-histories (make-key-weak-eq-hash-table)) unspecific)) (define (make-typein-buffer-name depth) diff --git a/src/edwin/xterm.scm b/src/edwin/xterm.scm index 83b059f10..3ee7d6f08 100644 --- a/src/edwin/xterm.scm +++ b/src/edwin/xterm.scm @@ -931,7 +931,7 @@ USA. table))) (define display/cached-atoms-tables - (let ((table (make-weak-eq-hash-table))) + (let ((table (make-key-weak-eq-hash-table))) (lambda (display) (or (hash-table-ref/default table display #f) (let ((result @@ -1111,7 +1111,7 @@ In either case, it is copied to the primary selection." #t))) (define display/selection-records - (let ((table (make-weak-eq-hash-table))) + (let ((table (make-key-weak-eq-hash-table))) (lambda (display) (or (hash-table-ref/default table display #f) (let ((result (make-strong-eq-hash-table))) diff --git a/src/imail/imail-core.scm b/src/imail/imail-core.scm index 75d174ab8..fe590f569 100644 --- a/src/imail/imail-core.scm +++ b/src/imail/imail-core.scm @@ -406,7 +406,7 @@ USA. (hash-table-delete! memoized-resources url)) (define memoized-resources - (make-weak-eq-hash-table)) + (make-key-weak-eq-hash-table)) ;;;; Folder operations diff --git a/src/ssp/xmlrpc.scm b/src/ssp/xmlrpc.scm index d2ff0b4d9..5f0d6f15e 100644 --- a/src/ssp/xmlrpc.scm +++ b/src/ssp/xmlrpc.scm @@ -58,7 +58,7 @@ USA. (apply handler params))))))))))) (define (get-xmlrpc-method-handler pathname name) - (let ((methods (make-weak-eq-hash-table))) + (let ((methods (make-key-weak-eq-hash-table))) (let ((environment (make-expansion-environment pathname))) (environment-define environment 'define-xmlrpc-method (lambda (name handler) diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm index 0794edd93..fab527c2a 100644 --- a/src/x11-screen/x11-screen.scm +++ b/src/x11-screen/x11-screen.scm @@ -870,7 +870,7 @@ USA. (define display/cached-atoms-tables ;; This table needs replacing. It holds interned symbols strongly! - (let ((table (make-weak-eq-hash-table))) + (let ((table (make-key-weak-eq-hash-table))) (lambda (display) (let ((key (intern (alien/address-string display)))) (or (hash-table-ref/default table key #f) @@ -1053,7 +1053,7 @@ In either case, it is copied to the primary selection." (define display/selection-records ;; This table needs replacing. It holds interned symbols strongly. - (let ((table (make-weak-eq-hash-table))) + (let ((table (make-key-weak-eq-hash-table))) (lambda (display) (let ((key (intern (alien/address-string display)))) (or (hash-table-ref/default table key #f) diff --git a/src/xdoc/xdoc.scm b/src/xdoc/xdoc.scm index 8ff5b368b..88152227d 100644 --- a/src/xdoc/xdoc.scm +++ b/src/xdoc/xdoc.scm @@ -88,10 +88,10 @@ USA. (*xdoc-environment* environment) (*xdoc-root*) (*xdoc-late?*) - (*xdoc-element-properties* (make-weak-eq-hash-table)) + (*xdoc-element-properties* (make-key-weak-eq-hash-table)) (*xdoc-id-map* (make-strong-eq-hash-table)) - (*xdoc-inputs* (make-weak-eq-hash-table)) - (*xdoc-outputs* (make-weak-eq-hash-table))) + (*xdoc-inputs* (make-key-weak-eq-hash-table)) + (*xdoc-outputs* (make-key-weak-eq-hash-table))) (let ((document (read/expand-xml-file pathname environment))) (set! *xdoc-root* (xml-document-root document)) (set! *xdoc-late?* (due-date-in-past?)) -- 2.25.1