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 576b3d47d5ccd90457b0f64e072ce3b58db2ec62..09e583264f9b3ca1629171b0a4554374b0c2b841 100644 (file)
--- 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))))
 \f
 ;;;; Code-point ranges
 

diff --git a/src/gdbm/gdbm.pkg b/src/gdbm/gdbm.pkg
index c3ab5dc09b3acafc8259b9a00d27e3b62c037f3f..4fd7f168280f360ad00cdd9a0bbe09303041460e 100644 (file)
--- 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 b0e264bb5b055c150991452c5c4fe9fb6b53c9fd..fd2b3a29b5d38dff148bbb216c8141a441b9ead3 100644 (file)
--- 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 1324bf90d46c427b3d1480b496b7b3c70713f409..74421e64129d35de691bc99d4fd93ce6805b1437 100644 (file)
--- 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 6fe5d69e83cb431fc3ac574fb7d6a010edbd9543..943ccbd231ad914ed115f470726eaf0d81e10cc8 100644 (file)
--- 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 4bbef4bf675de5ef810ab254e1707a3bbce4bc24..16a728a1a8bec664ca91e3be8af3595591fa6413 100644 (file)
--- 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 66af0e758b770941bb5548b7ec6fc72b4ca35451..e8be16c38ccc38997a70ce83b617a2d8c3b270ab 100644 (file)
--- 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 d3e4e3eaebb66c2e702d1ec1b6eafd54ba455328..b2b16730b36dc2e5e708bc9820856f676379e926 100644 (file)
--- 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?)