From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 4 Mar 2017 09:01:48 +0000 (-0800)
Subject: Finish changing string-ci-hash to string-hash-ci.
X-Git-Tag: mit-scheme-pucked-9.2.12~196^2~9
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=895d98be6e432b3d8d1d689c00a71caf81875d9b;p=mit-scheme.git

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

diff --git a/src/runtime/hashtb.scm b/src/runtime/hashtb.scm
index fb5e64e16..808db3e32 100644
--- 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 83ecf0487..412d4ced0 100644
--- 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 ede4d7175..c13edc268 100644
--- 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)