Finish changing string-ci-hash to string-hash-ci.

diff --git a/src/runtime/hashtb.scm b/src/runtime/hashtb.scm
index fb5e64e162f6294c6e8bae265d70488491690715..808db3e32e7f1eb8114c9e874d977204a34fc22e 100644 (file)
--- a/src/runtime/hashtb.scm
+++ b/src/runtime/hashtb.scm
@@ -1301,7 +1301,7 @@ USA.
                        (if (and (or (eq? key=? string=?)
                                     (eq? key=? string-ci=?))
                                 (or (eq? key-hash string-hash)
-                                    (eq? key-hash string-ci-hash)
+                                    (eq? key-hash string-hash-ci)
                                     (eq? key-hash hash)))
                            #f          ;No rehash needed after GC
                            #t)         ;Rehash needed after GC

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 83ecf048757a005d1bd487b16dad594d8334c1b2..412d4ced0fe5fd9986d50a8dd941228dd18cea58 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -933,6 +933,7 @@ USA.
   (files "ustring")
   (parent (runtime))
   (export () deprecated:ustring
+         (string-ci-hash string-hash-ci)
          (string-hash-mod string-hash)
          (substring->list string->list)
          (substring-move-left! substring-move!)
@@ -978,7 +979,6 @@ USA.
          string-append
          string-append*
          string-builder
-         string-ci-hash
          string-ci<=?
          string-ci<?
          string-ci=?

diff --git a/src/runtime/ustring.scm b/src/runtime/ustring.scm
index ede4d7175bdec05f41b6f384066ddbd07b9568d2..c13edc268d149c0e3b756ede0e193f21deaeaccf 100644 (file)
--- a/src/runtime/ustring.scm
+++ b/src/runtime/ustring.scm
@@ -1382,7 +1382,7 @@ USA.
        ((ucode-primitive string-hash) string*)
        ((ucode-primitive string-hash-mod) string* modulus))))
 
-(define (string-ci-hash string #!optional modulus)
+(define (string-hash-ci string #!optional modulus)
   (string-hash (string-foldcase string) modulus))
 
 (define (8-bit-string? object)