From 69f92bea351ea8ccdd130109a2f243e1e7ba12ae Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Mon, 13 May 2002 07:16:19 +0000
Subject: [PATCH] clos/{builtin,kernel}.lsp: Added classes for STREAM,
 *-STREAM, HASHTABLE, PACKAGE, LOGICAL-PATHNAME, REAL, READTABLE,
 RANDOM-STATE.

---
 src/clos/builtin.lsp | 59 ++++++++++++++++++++++++++++++++++++++------
 src/clos/kernel.lsp  | 31 +++--------------------
 2 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/clos/builtin.lsp b/src/clos/builtin.lsp
index 914795fee..7cc8ffd52 100644
--- a/src/clos/builtin.lsp
+++ b/src/clos/builtin.lsp
@@ -16,6 +16,7 @@
 ;;; ----------------------------------------------------------------------
 ;;; Predefined Common Lisp Classes
 
+#|
 ;(defclass t (object) () (:metaclass built-in))
 
 (defclass array (t) () (:metaclass built-in))
@@ -26,6 +27,15 @@
    (defclass vector (array sequence) () (:metaclass built-in))
       (defclass bit-vector (vector) () (:metaclass built-in))
 
+(defclass stream (t) () (:metaclass built-in))
+  (defclass file-stream (stream) () (:metaclass built-in))
+  (defclass echo-stream (stream) () (:metaclass built-in))
+  (defclass string-stream (stream) () (:metaclass built-in))
+  (defclass two-way-stream (stream) () (:metaclass built-in))
+  (defclass synonym-stream (stream) () (:metaclass built-in))
+  (defclass broadcast-stream (stream) () (:metaclass built-in))
+  (defclass concatenated-stream (stream) () (:metaclass built-in))
+
 (defclass character (t) () (:metaclass built-in))
 
 (defclass number (t) () (:metaclass built-in))
@@ -39,19 +49,54 @@
    (defclass null (symbol list) () (:metaclass built-in))
    (defclass keyword (symbol) () (:metaclass built-in))
 
+(defclass function (t) () (:metaclass built-in))
+
 (defclass pathname (t) () (:metaclass built-in))
    (defclass logical-pathname (pathname) () (:metaclass built-in))
+|#
+
+(eval-when (compile load eval)
+  (mapcar #'(lambda (args &aux (class (first args)) (super (cdr args)))
+	      (eval `(defclass ,class ,super () (:metaclass built-in))))
+	  '(;(t object)
+	    (sequence t)
+	      (list sequence)
+	        (cons list)
+	    (array t)
+	      (string array sequence)
+	      (vector array sequence)
+	        (bit-vector vector)
+	    (stream t)
+	      (file-stream stream)
+	      (echo-stream stream)
+	      (string-stream stream)
+	      (two-way-stream stream)
+	      (synonym-stream stream)
+	      (broadcast-stream stream)
+	      (concatenated-stream stream)
+	    (character t)
+	    (number t)
+	      (real number)
+	        (rational real)
+		  (integer rational)
+		  (ratio rational)
+	        (float real)
+	      (complex number)
+	    (symbol t)
+	      (null symbol list)
+	      (keyword symbol)
+	    (package t)
+	    (function t)
+	    (pathname t)
+	      (logical-pathname pathname)
+	    (hash-table t)
+	    (random-state)
+	    (readtable))))
 
 ;;; Now we protect classes from redefinition:
 (defun setf-find-class (name new-value)
   (cond
-   ((member name '(T NIL NULL SYMBOL KEYWORD ATOM CONS LIST SEQUENCE
-		     NUMBER INTEGER BIGNUM RATIONAL RATIO FLOAT
-		     SHORT-FLOAT SINGLE-FLOAT DOUBLE-FLOAT LONG-FLOAT COMPLEX
-		     CHARACTER STANDARD-CHAR BASE-CHAR EXTENDED-CHAR
-		     PACKAGE STREAM PATHNAME READTABLE HASH-TABLE RANDOM-STATE
-		     STRUCTURE ARRAY SIMPLE-ARRAY FUNCTION COMPILED-FUNCTION
-		     LOGICAL-PATHNAME))
+   ((typep (find-class name nil) 'built-in)
     (error "The class associated to the CL specifier ~S cannot be changed."
 	   name))
    ((member name '(CLASS BUILT-IN) :test #'eq)
diff --git a/src/clos/kernel.lsp b/src/clos/kernel.lsp
index 9845031a8..fc915558e 100644
--- a/src/clos/kernel.lsp
+++ b/src/clos/kernel.lsp
@@ -16,29 +16,9 @@
 (defun class-of (object)
   (if (si:instancep object)
       (si:instance-class object)
-      (typecase object
-	(NULL (find-class 'null))
-	(KEYWORD (find-class 'keyword))
-	(SYMBOL (find-class 'symbol))
-	(CONS (find-class 'cons))
-	(LIST (find-class 'list))
-	(STRING (find-class 'string))
-	(BIT-VECTOR (find-class 'bit-vector))
-	(VECTOR (find-class 'vector))
-	(SEQUENCE (find-class 'sequence))
-	(ARRAY (find-class 'array))
-	(CHARACTER (find-class 'character))
-	(INTEGER (find-class 'integer))
-	(RATIO (find-class 'ratio))
-	(RATIONAL (find-class 'rational))
-	(FLOAT (find-class 'float))
-	(COMPLEX (find-class 'complex))
-	(NUMBER (find-class 'number))
-	(PATHNAME (find-class 'pathname))
-	(LOGICAL-PATHNAME (find-class 'logical-pathname))
-	(t (find-class 't)))))
+      (closest-class (type-of object))))
 
-(defun closest-class (type &aux fd)
+(defun closest-class (type)
   (or (find-class type nil)
       (case type
 	((FIXNUM BIGNUM) (find-class 'integer))
@@ -48,11 +28,8 @@
 	(SIMPLE-VECTOR (find-class 'vector))
 	(SIMPLE-BIT-VECTOR (find-class 'bit-vector))
 	(SIMPLE-STRING (find-class 'string))
-	((PACKAGE HASHTABLE STREAM READTABLE COMPILED-FUNCTION
-		  CONT THREAD DISPATCH-FUNCTION)
-	 (find-class 't)))))
-	  
-	  
+	((CONT THREAD DISPATCH-FUNCTION) (find-class 't)))))
+
 
 ;;; ----------------------------------------------------------------------
 ;;; Each instance has a pointer to the class of which it is an instance.