From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 23 Jan 2018 08:11:39 +0000 (-0800)
Subject: Rename file "ustring" to "string" and update package name too.
X-Git-Tag: mit-scheme-pucked-x11-0.3.1~7^2~313
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5983a09ee06263676d80844077d25d90e400d017;p=mit-scheme.git

Rename file "ustring" to "string" and update package name too.
---

diff --git a/src/etc/ucd-converter.scm b/src/etc/ucd-converter.scm
index 576b3d47d..09e583264 100644
--- a/src/etc/ucd-converter.scm
+++ b/src/etc/ucd-converter.scm
@@ -446,7 +446,7 @@ USA.
 			      (read-prop-file "canonical-dm")))))
 
 (define char-full-composition-exclusion?
-  (access char-full-composition-exclusion? (->environment '(runtime ustring))))
+  (access char-full-composition-exclusion? (->environment '(runtime string))))
 
 ;;;; Code-point ranges
 
diff --git a/src/gdbm/gdbm.pkg b/src/gdbm/gdbm.pkg
index c3ab5dc09..4fd7f1682 100644
--- a/src/gdbm/gdbm.pkg
+++ b/src/gdbm/gdbm.pkg
@@ -30,7 +30,7 @@ USA.
   (files "gdbm")
   (parent ())
   (initialization (initialize-package!))
-  (import (runtime ustring)
+  (import (runtime string)
 	  cp1-ref
 	  ustring-cp-size
 	  ustring?)
diff --git a/src/pgsql/pgsql.pkg b/src/pgsql/pgsql.pkg
index b0e264bb5..fd2b3a29b 100644
--- a/src/pgsql/pgsql.pkg
+++ b/src/pgsql/pgsql.pkg
@@ -30,7 +30,7 @@ USA.
   (files "pgsql")
   (parent ())
   (initialization (initialize-package!))
-  (import (runtime ustring)
+  (import (runtime string)
 	  cp1-ref
 	  ustring-cp-size
 	  ustring?)
diff --git a/src/runtime/ed-ffi.scm b/src/runtime/ed-ffi.scm
index 1324bf90d..74421e641 100644
--- a/src/runtime/ed-ffi.scm
+++ b/src/runtime/ed-ffi.scm
@@ -153,6 +153,7 @@ USA.
     ("srfi-1"	(runtime srfi-1))
     ("stack-sample" (runtime stack-sampler))
     ("stream"	(runtime stream))
+    ("string"	(runtime string))
     ("string-io" (runtime string-i/o-port))
     ("structure-parser" (runtime structure-parser))
     ("swank"	(runtime swank))
@@ -186,7 +187,6 @@ USA.
     ("url"	(runtime uri))
     ("urtrap"	(runtime reference-trap))
     ("usrint"	(runtime user-interface))
-    ("ustring"	(runtime ustring))
     ("vector"	(runtime vector))
     ("version"	(runtime))
     ("where"	(runtime environment-inspector))
diff --git a/src/runtime/make.scm b/src/runtime/make.scm
index 6fe5d69e8..943ccbd23 100644
--- a/src/runtime/make.scm
+++ b/src/runtime/make.scm
@@ -365,7 +365,7 @@ USA.
 	 ("thread-low" . (runtime thread))
 	 ("vector" . (RUNTIME VECTOR))))
       (files1
-       '(("ustring" . (RUNTIME USTRING))
+       '(("string" . (runtime string))
 	 ("symbol" . (RUNTIME SYMBOL))
 	 ("procedure" . (runtime procedure))
 	 ("random" . (RUNTIME RANDOM-NUMBER))
@@ -464,7 +464,7 @@ USA.
    (RUNTIME BYTEVECTOR)
    (RUNTIME CHARACTER-SET)
    (RUNTIME LAMBDA-ABSTRACTION)
-   (RUNTIME USTRING)
+   (runtime string)
    (RUNTIME STREAM)
    (RUNTIME 2D-PROPERTY)
    (RUNTIME HASH-TABLE)
diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 4bbef4bf6..16a728a1a 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -998,8 +998,8 @@ USA.
 	  vector-8b-ref
 	  vector-8b-set!))
 
-(define-package (runtime ustring)
-  (files "ustring")
+(define-package (runtime string)
+  (files "string")
   (parent (runtime))
   (export () deprecated:string
 	  (string-ci-hash string-hash-ci)
@@ -1377,7 +1377,7 @@ USA.
   (export (runtime ucd-glue)
 	  char-set:changes-when-case-folded
 	  ucd-nt-value)
-  (export (runtime ustring)
+  (export (runtime string)
 	  char-changes-when-case-folded?
 	  char-changes-when-lower-cased?
 	  char-changes-when-upper-cased?
diff --git a/src/runtime/ustring.scm b/src/runtime/string.scm
similarity index 99%
rename from src/runtime/ustring.scm
rename to src/runtime/string.scm
index 66af0e758..e8be16c38 100644
--- a/src/runtime/ustring.scm
+++ b/src/runtime/string.scm
@@ -25,7 +25,7 @@ USA.
 |#
 
 ;;;; Unicode strings
-;;; package: (runtime ustring)
+;;; package: (runtime string)
 
 ;;; For simplicity, the implementation uses a 24-bit encoding for non-8-bit
 ;;; strings.  This is not a good long-term approach and should be revisited once
@@ -294,7 +294,7 @@ USA.
   (%record %slice-tag string start length))
 
 (define-integrable %slice-tag
-  '|#[(runtime ustring)slice]|)
+  '|#[(runtime string)slice]|)
 
 (define-integrable (slice-string slice) (%record-ref slice 1))
 (define-integrable (slice-start slice) (%record-ref slice 2))
diff --git a/src/x11/x11.pkg b/src/x11/x11.pkg
index d3e4e3eae..b2b16730b 100644
--- a/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@ -33,7 +33,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 (define-package (x11 base)
   (files "x11-base")
   (parent (x11))
-  (import (runtime ustring)
+  (import (runtime string)
 	  cp1-ref
 	  ustring-cp-size
 	  ustring?)