src/class-finalize-impl.lisp (check-sod-class): Remove `w/del' wrapper.

[sod] / src / parser / streams-impl.lisp

diff --git a/src/parser/streams-impl.lisp b/src/parser/streams-impl.lisp
index d62429a9927caf687df4aaa38a6b0e56bb81b88c..378f9a80d1c0d45a8847731e38c8106d9ef463d1 100644 (file)
--- a/src/parser/streams-impl.lisp
+++ b/src/parser/streams-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -120,7 +120,8 @@ (defmethod stream-clear-input ((stream proxy-input-stream))
     (clear-input ustream)))
 
 (defmethod stream-read-sequence
-    ((stream proxy-input-stream) seq &optional (start 0) end)
+    ((stream proxy-input-stream) seq
+     #+clisp &key #-clisp &optional (start 0) end)
   (with-slots (ustream) stream
     (read-sequence seq ustream :start start :end end)))
 
@@ -144,7 +145,8 @@ (defmethod stream-force-output ((stream proxy-output-stream))
     (force-output ustream)))
 
 (defmethod stream-write-sequence
-    ((stream proxy-output-stream) seq &optional (start 0) end)
+    ((stream proxy-output-stream) seq
+     #+clisp &key #-clisp &optional (start 0) end)
   (with-slots (ustream) stream
     (write-sequence seq ustream :start start :end end)))
 
@@ -212,7 +214,7 @@ (export '(position-aware-stream
          position-aware-stream-line position-aware-stream-column))
 (defclass position-aware-stream (proxy-stream)
   ((file :initarg :file :initform nil
-        :type pathname :accessor position-aware-stream-file)
+        :type (or pathname null) :accessor position-aware-stream-file)
    (line :initarg :line :initform 1
         :type fixnum :accessor position-aware-stream-line)
    (column :initarg :column :initform 0
@@ -306,7 +308,8 @@ (defmethod stream-unread-char ((stream position-aware-input-stream) char)
   (call-next-method))
 
 (defmethod stream-read-sequence
-    ((stream position-aware-input-stream) seq &optional (start 0) end)
+    ((stream position-aware-input-stream) seq
+     #+clisp &key #-clisp &optional (start 0) end)
   (declare (ignore end))
   (let ((pos (call-next-method)))
     (with-position (stream)
@@ -345,7 +348,8 @@ (defclass position-aware-output-stream
    insertion of some user code."))
 
 (defmethod stream-write-sequence
-    ((stream position-aware-output-stream) seq &optional (start 0) end)
+    ((stream position-aware-output-stream) seq
+     #+clisp &key #-clisp &optional (start 0) end)
   (with-position (stream)
     (dosequence (ch seq :start start :end end)
       (update ch))