From e2d8b5baeb0e8235ff94071c78e0dab924d79dd1 Mon Sep 17 00:00:00 2001
From: dtc <dtc>
Date: Tue, 3 Feb 1998 19:22:23 +0000
Subject: [PATCH] Remove the remnants of the string-char type.

---
 code/exports.lisp                 | 10 +++++-----
 code/pred.lisp                    |  4 ++--
 compiler/generic/primtype.lisp    |  3 +--
 compiler/generic/vm-fndb.lisp     |  4 ++--
 compiler/generic/vm-typetran.lisp |  3 +--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/code/exports.lisp b/code/exports.lisp
index 98a41b285..76349c560 100644
--- a/code/exports.lisp
+++ b/code/exports.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.138 1998/01/29 07:22:29 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.139 1998/02/03 19:22:15 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -517,8 +517,8 @@
              "STORAGE-CONDITION" "STORE-VALUE" "STREAM"
              "STREAM-ELEMENT-TYPE" "STREAM-ERROR" "STREAM-ERROR-STREAM"
 	     "STREAM-EXTERNAL-FORMAT"
-	     "STREAMP" "STRING" "STRING-CAPITALIZE" "STRING-CHAR"
-             "STRING-CHAR-P" "STRING-DOWNCASE" "STRING-EQUAL"
+	     "STREAMP" "STRING" "STRING-CAPITALIZE"
+             "STRING-DOWNCASE" "STRING-EQUAL"
              "STRING-GREATERP" "STRING-LEFT-TRIM" "STRING-LESSP"
              "STRING-NOT-EQUAL" "STRING-NOT-GREATERP" "STRING-NOT-LESSP"
              "STRING-RIGHT-TRIM" "STRING-STREAM"
@@ -600,7 +600,7 @@
        "READ-ONLY-SPACE-START" "SHORT-FLOAT-P" "STATIC-SPACE-START" "STRING/=*"
        "STRING<*" "STRING<=*" "STRING=*" "STRING>*" "STRING>=*"))
   (intern name "LISP"))
-(dolist (name '("%PRIMITIVE" "%STANDARD-CHAR-P" "%STRING-CHAR-P"))
+(dolist (name '("%PRIMITIVE" "%STANDARD-CHAR-P"))
   (intern name "SYSTEM"))
 (intern "BIGNUM-TYPE" "BIGNUM")
 (dolist
@@ -1214,7 +1214,7 @@
              "%SP-BYTE-BLT" "%SP-FIND-CHARACTER"
              "%SP-FIND-CHARACTER-WITH-ATTRIBUTE"
              "%SP-REVERSE-FIND-CHARACTER-WITH-ATTRIBUTE" "%STANDARD-CHAR-P"
-             "%STRING-CHAR-P" "*BEEP-FUNCTION*"
+             "*BEEP-FUNCTION*"
 	     "*LONG-SITE-NAME*" "*SHORT-SITE-NAME*"
              "*SOFTWARE-TYPE*" "*STDERR*" "*STDIN*" "*STDOUT*" "*TASK-DATA*"
              "*TASK-NOTIFY*" "*TASK-SELF*" "*TTY*" "*TYPESCRIPTPORT*"
diff --git a/code/pred.lisp b/code/pred.lisp
index 1da31992f..5c3c08233 100644
--- a/code/pred.lisp
+++ b/code/pred.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.44 1998/01/05 22:34:54 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.45 1998/02/03 19:22:18 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -34,7 +34,7 @@
 	  fixnum float function integer keyword list long-float nil
 	  null number ratio rational real sequence short-float signed-byte
 	  simple-array simple-bit-vector simple-string simple-vector
-	  single-float standard-char string string-char symbol t
+	  single-float standard-char base-char string symbol t
 	  unsigned-byte vector satisfies))
 
 
diff --git a/compiler/generic/primtype.lisp b/compiler/generic/primtype.lisp
index f0b3e8437..a63b53604 100644
--- a/compiler/generic/primtype.lisp
+++ b/compiler/generic/primtype.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/primtype.lisp,v 1.17 1997/12/13 11:57:57 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/primtype.lisp,v 1.18 1998/02/03 19:22:20 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -160,7 +160,6 @@
 ;;; 
 (defvar *simple-array-primitive-types*
   '((base-char . simple-string)
-    (string-char . simple-string)
     (bit . simple-bit-vector)
     ((unsigned-byte 2) . simple-array-unsigned-byte-2)
     ((unsigned-byte 4) . simple-array-unsigned-byte-4)
diff --git a/compiler/generic/vm-fndb.lisp b/compiler/generic/vm-fndb.lisp
index 1641fcda8..36f1a901c 100644
--- a/compiler/generic/vm-fndb.lisp
+++ b/compiler/generic/vm-fndb.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/vm-fndb.lisp,v 1.57 1997/11/15 04:39:01 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/vm-fndb.lisp,v 1.58 1998/02/03 19:22:22 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -51,7 +51,7 @@
 	   #+complex-float complex-rational-p #+complex-float complex-float-p
 	   #+complex-float complex-single-float-p
 	   #+complex-float complex-double-float-p
-	   base-char-p %string-char-p %standard-char-p %instancep
+	   base-char-p %standard-char-p %instancep
 	   array-header-p simple-array-p simple-array-unsigned-byte-2-p
 	   simple-array-unsigned-byte-4-p simple-array-unsigned-byte-8-p
 	   simple-array-unsigned-byte-16-p simple-array-unsigned-byte-32-p
diff --git a/compiler/generic/vm-typetran.lisp b/compiler/generic/vm-typetran.lisp
index ff70711ed..6e2a660f9 100644
--- a/compiler/generic/vm-typetran.lisp
+++ b/compiler/generic/vm-typetran.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/vm-typetran.lisp,v 1.13 1997/11/01 22:58:40 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/vm-typetran.lisp,v 1.14 1998/02/03 19:22:23 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -82,5 +82,4 @@
 ;;; Unlike the un-%'ed versions, these are true type predicates, accepting any
 ;;; type object.
 ;;;
-;(define-type-predicate %string-char-p string-char)
 (define-type-predicate %standard-char-p standard-char)
-- 
GitLab