Place C standard I/O based streams into subtype.

* lib.c (subtypep): Handle subtype check here between
stream and stdio-stream as a special case, since streams
aren't structures related by inheritance, but built-ins.
(class_check): If the type of obj doesn't match the class
exactly, use a subtypep check. We need this because stream
functions use this check, and stdio streams are not of the
stream type now.

* stream.c (stdio_stream_s): New global symbol variable.
(make_stdio_stream_common): Use stdio_stream_s symbol for the
type of stdio streams.
(stream_init): Intern the stdio-stream symbol, and store in
stdio_stream_s variable.
(streamp): Replace exact check with typep.

* stream.h (stdio_stream_s): Declared.

1 files changed, 3 insertions, 1 deletions

diff --git a/lib.c b/lib.c
index 817f9449..2f8440e3 100644
--- a/lib.c
+++ b/lib.c
@@ -222,6 +222,8 @@ val subtypep(val sub, val sup)
                 sub == list_s);
   } else if (sup == string_s) {
     return tnil(sub == str_s || sub == lit_s || sub == lstr_s);
+  } else if (sup == stream_s) {
+    return tnil(sub == stdio_stream_s);
   } else {
     val sub_struct = find_struct_type(sub);
     val sup_struct = find_struct_type(sup);
@@ -269,7 +271,7 @@ val type_check3(val obj, int t1, int t2, int t3)
 val class_check(val cobj, val class_sym)
 {
   type_assert (is_ptr(cobj) && cobj->t.type == COBJ &&
-               cobj->co.cls == class_sym,
+              (cobj->co.cls == class_sym || subtypep(cobj->co.cls, class_sym)),
                (lit("~s is not of type ~s"), cobj, class_sym, nao));
   return t;
 }