From 496cb83537879b8adc8eab2305fe13673a4fc95c Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 10 Feb 2017 00:14:02 -0800 Subject: [PATCH] Use non-pointer hash tables for UCD tables. --- src/etc/ucd-converter.scm | 4 +--- src/runtime/ucd-table-alpha.scm | 2 +- src/runtime/ucd-table-gc.scm | 2 +- src/runtime/ucd-table-lower.scm | 2 +- src/runtime/ucd-table-nt.scm | 4 ++-- src/runtime/ucd-table-slc.scm | 4 ++-- src/runtime/ucd-table-suc.scm | 4 ++-- src/runtime/ucd-table-upper.scm | 2 +- src/runtime/ucd-table-wspace.scm | 2 +- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/etc/ucd-converter.scm b/src/etc/ucd-converter.scm index bfc7dbdee..9c3f1c2c1 100644 --- a/src/etc/ucd-converter.scm +++ b/src/etc/ucd-converter.scm @@ -509,9 +509,7 @@ USA. (hash-table-ref/default ,table-name sv ,(and default-value (default-value 'sv)))) (define-deferred ,table-name - ;; TODO(cph): this table uses fixnums as keys. It doesn't need to rehash - ;; on GC, but for now this is expedient. - (let ((table (make-strong-eq-hash-table))) + (let ((table (make-non-pointer-hash-table))) (for-each (lambda (p) (hash-table-set! table (car p) (cdr p))) ',mapping) diff --git a/src/runtime/ucd-table-alpha.scm b/src/runtime/ucd-table-alpha.scm index e1d7f6e3c..0eb9e46a6 100644 --- a/src/runtime/ucd-table-alpha.scm +++ b/src/runtime/ucd-table-alpha.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: Alpha -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:15-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:06-08 (declare (usual-integrations)) diff --git a/src/runtime/ucd-table-gc.scm b/src/runtime/ucd-table-gc.scm index 94a700863..07dd519f9 100644 --- a/src/runtime/ucd-table-gc.scm +++ b/src/runtime/ucd-table-gc.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: gc -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:16-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:07-08 (declare (usual-integrations)) diff --git a/src/runtime/ucd-table-lower.scm b/src/runtime/ucd-table-lower.scm index ff1adb93d..fb1cef326 100644 --- a/src/runtime/ucd-table-lower.scm +++ b/src/runtime/ucd-table-lower.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: Lower -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:15-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:06-08 (declare (usual-integrations)) diff --git a/src/runtime/ucd-table-nt.scm b/src/runtime/ucd-table-nt.scm index 632e3745d..683c929b9 100644 --- a/src/runtime/ucd-table-nt.scm +++ b/src/runtime/ucd-table-nt.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: nt -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:17-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:08-08 (declare (usual-integrations)) @@ -34,7 +34,7 @@ USA. (hash-table-ref/default char-map:numeric-type sv #f)) (define-deferred char-map:numeric-type - (let ((table (make-strong-eq-hash-table))) + (let ((table (make-non-pointer-hash-table))) (for-each (lambda (p) (hash-table-set! table (car p) (cdr p))) diff --git a/src/runtime/ucd-table-slc.scm b/src/runtime/ucd-table-slc.scm index fe8a0a1ab..5224893c2 100644 --- a/src/runtime/ucd-table-slc.scm +++ b/src/runtime/ucd-table-slc.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: slc -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:17-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:08-08 (declare (usual-integrations)) @@ -34,7 +34,7 @@ USA. (hash-table-ref/default char-map:simple-lower-case sv sv)) (define-deferred char-map:simple-lower-case - (let ((table (make-strong-eq-hash-table))) + (let ((table (make-non-pointer-hash-table))) (for-each (lambda (p) (hash-table-set! table (car p) (cdr p))) diff --git a/src/runtime/ucd-table-suc.scm b/src/runtime/ucd-table-suc.scm index 23e7f5add..66310dc98 100644 --- a/src/runtime/ucd-table-suc.scm +++ b/src/runtime/ucd-table-suc.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: suc -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:17-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:09-08 (declare (usual-integrations)) @@ -34,7 +34,7 @@ USA. (hash-table-ref/default char-map:simple-upper-case sv sv)) (define-deferred char-map:simple-upper-case - (let ((table (make-strong-eq-hash-table))) + (let ((table (make-non-pointer-hash-table))) (for-each (lambda (p) (hash-table-set! table (car p) (cdr p))) diff --git a/src/runtime/ucd-table-upper.scm b/src/runtime/ucd-table-upper.scm index b6a0245cd..8e6ddb665 100644 --- a/src/runtime/ucd-table-upper.scm +++ b/src/runtime/ucd-table-upper.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: Upper -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:15-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:06-08 (declare (usual-integrations)) diff --git a/src/runtime/ucd-table-wspace.scm b/src/runtime/ucd-table-wspace.scm index 3ef71f428..600383848 100644 --- a/src/runtime/ucd-table-wspace.scm +++ b/src/runtime/ucd-table-wspace.scm @@ -26,7 +26,7 @@ USA. ;;;; UCD property: WSpace -;;; Generated from Unicode 9.0.0 UCD at 2017-02-09T23:45:15-08 +;;; Generated from Unicode 9.0.0 UCD at 2017-02-10T00:13:07-08 (declare (usual-integrations)) -- 2.25.1