From 75a2ae89e11fbf55b739faec67b36a0697a22504 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Tue, 1 May 2007 14:57:40 +0200 Subject: [PATCH] Fixed breakage: IO.STREAMS now exports DUAL-CHANNEL-GRAY-STREAM. Signed-off-by: Stelian Ionescu --- io.streams/classes.lisp | 10 +++++----- io.streams/fd-mixin.lisp | 12 ++++++------ io.streams/pkgdcl.lisp | 7 ++++--- sockets/base-sockets.lisp | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/io.streams/classes.lisp b/io.streams/classes.lisp index 05da6c8..965878e 100644 --- a/io.streams/classes.lisp +++ b/io.streams/classes.lisp @@ -70,7 +70,7 @@ (deftype stream-position () '(unsigned-byte 64)) -(defclass dual-channel-fd-stream-mixin () +(defclass dual-channel-fd-mixin () ((input-fd :initform nil :accessor input-fd-of) (output-fd :initform nil :accessor output-fd-of))) @@ -81,16 +81,16 @@ (defgeneric (setf output-fd-non-blocking) (mode fd-mixin)) -(defclass dual-channel-single-fd-stream-mixin (dual-channel-fd-stream-mixin) ()) +(defclass dual-channel-single-fd-mixin (dual-channel-fd-mixin) ()) (defgeneric fd-of (stream) - (:method ((stream dual-channel-single-fd-stream-mixin)) + (:method ((stream dual-channel-single-fd-mixin)) (with-accessors ((fd-in input-fd-of) (fd-out output-fd-of)) stream (assert (eql fd-in fd-out)) (values fd-in)))) (defgeneric (setf fd-of) (fd stream) - (:method (fd (stream dual-channel-single-fd-stream-mixin)) + (:method (fd (stream dual-channel-single-fd-mixin)) (with-accessors ((fd-in input-fd-of) (fd-out output-fd-of)) stream (assert (eql fd-in fd-out)) @@ -106,7 +106,7 @@ ;;; ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defclass dual-channel-gray-stream (dual-channel-fd-stream-mixin +(defclass dual-channel-gray-stream (dual-channel-fd-mixin fundamental-binary-input-stream fundamental-binary-output-stream fundamental-character-input-stream diff --git a/io.streams/fd-mixin.lisp b/io.streams/fd-mixin.lisp index ac7cc5b..170d26c 100644 --- a/io.streams/fd-mixin.lisp +++ b/io.streams/fd-mixin.lisp @@ -38,20 +38,20 @@ (et:fcntl fd et:f-setfl new-flags)) (values mode))) -(defmethod input-fd-non-blocking ((fd-mixin dual-channel-fd-stream-mixin)) +(defmethod input-fd-non-blocking ((fd-mixin dual-channel-fd-mixin)) (%get-fd-nonblock-mode (fd-of fd-mixin))) -(defmethod (setf input-fd-non-blocking) (mode (fd-mixin dual-channel-fd-stream-mixin)) +(defmethod (setf input-fd-non-blocking) (mode (fd-mixin dual-channel-fd-mixin)) (check-type mode boolean "a boolean value") (%set-fd-nonblock-mode (fd-of fd-mixin) mode)) -(defmethod output-fd-non-blocking ((fd-mixin dual-channel-fd-stream-mixin)) +(defmethod output-fd-non-blocking ((fd-mixin dual-channel-fd-mixin)) (%get-fd-nonblock-mode (output-fd-of fd-mixin))) -(defmethod (setf output-fd-non-blocking) (mode (fd-mixin dual-channel-fd-stream-mixin)) +(defmethod (setf output-fd-non-blocking) (mode (fd-mixin dual-channel-fd-mixin)) (check-type mode boolean "a boolean value") (%set-fd-nonblock-mode (output-fd-of fd-mixin) mode)) -(defmethod fd-non-blocking ((fd-mixin dual-channel-single-fd-stream-mixin)) +(defmethod fd-non-blocking ((fd-mixin dual-channel-single-fd-mixin)) (%get-fd-nonblock-mode (fd-of fd-mixin))) -(defmethod (setf fd-non-blocking) (mode (fd-mixin dual-channel-single-fd-stream-mixin)) +(defmethod (setf fd-non-blocking) (mode (fd-mixin dual-channel-single-fd-mixin)) (check-type mode boolean "a boolean value") (%set-fd-nonblock-mode (fd-of fd-mixin) mode)) diff --git a/io.streams/pkgdcl.lisp b/io.streams/pkgdcl.lisp index 35f0690..57c249d 100644 --- a/io.streams/pkgdcl.lisp +++ b/io.streams/pkgdcl.lisp @@ -40,11 +40,12 @@ #:ub8 #:ub16 #:ub32 #:sb8 #:sb16 #:sb32 #:ub8-sarray #:ub8-vector #:ub16-sarray #:external-format-of - #:dual-channel-fd-stream-mixin + #:dual-channel-fd-mixin #:input-fd #:input-fd-of #:input-fd-non-blocking #:output-fd #:output-fd-of #:output-fd-non-blocking - #:dual-channel-single-fd-stream-mixin - #:fd-of #:fd-non-blocking)))) + #:dual-channel-single-fd-mixin + #:fd-of #:fd-non-blocking + #:dual-channel-gray-stream)))) (def-my-package #:fundamental-binary-input-stream #:fundamental-binary-output-stream #:fundamental-character-input-stream #:fundamental-character-output-stream diff --git a/sockets/base-sockets.lisp b/sockets/base-sockets.lisp index f8d4a7c..4f64d0c 100644 --- a/sockets/base-sockets.lisp +++ b/sockets/base-sockets.lisp @@ -27,7 +27,7 @@ ;;; ;;; ;;;;;;;;;;;;;;; -(defclass socket (dual-channel-single-fd-stream-mixin) +(defclass socket (dual-channel-single-fd-mixin) ((family :initarg :family :accessor socket-family) (protocol :initarg :protocol :accessor socket-protocol))) -- 2.11.4.GIT