Mercurial Mercurial > hg > stx-libbasic / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved readErrorSignal / writeErrorSignal up in the hierarchy
authorClaus Gittinger <cg@exept.de>
Sat, 23 Dec 1995 20:05:00 +0100
changeset 820 6d934f5d6cbc
parent 819 f17cddc493f4
child 821 c8e9714749ea
moved readErrorSignal / writeErrorSignal up in the hierarchy
ExtStream.st file | annotate | diff | comparison | revisions
ExternalStream.st file | annotate | diff | comparison | revisions
Stream.st file | annotate | diff | comparison | revisions 
--- a/ExtStream.st	Sat Dec 23 19:57:33 1995 +0100
+++ b/ExtStream.st	Sat Dec 23 20:05:00 1995 +0100
@@ -12,10 +12,10 @@
 
 ReadWriteStream subclass:#ExternalStream
 	 instanceVariableNames:'filePointer mode buffered binary useCRLF hitEOF didWrite
-                lastErrorNumber'
-	 classVariableNames:'Lobby LastErrorNumber ReadErrorSignal WriteErrorSignal
-                InvalidReadSignal InvalidWriteSignal InvalidModeSignal
-                OpenErrorSignal StreamNotOpenSignal'
+		lastErrorNumber'
+	 classVariableNames:'Lobby LastErrorNumber 
+		InvalidReadSignal InvalidWriteSignal InvalidModeSignal
+		OpenErrorSignal StreamNotOpenSignal'
 	 poolDictionaries:''
 	 category:'Streams-External'
 !
@@ -137,8 +137,6 @@
 	Lobby           <Registry>      keeps track of used ext-streams (to free up FILE*'s)
 
 	StreamErrorSignal       <Signal> parent of all stream errors (see Stream class)
-	ReadErrorSignal         <Signal> raised on read errors
-	WriteErrorSignal        <Signal> raised on write errors
 	InvalidReadSignal       <Signal> raised on read from writeonly stream
 	InvalidWriteSignal      <Signal> raised on write to readonly stream 
 	InvalidModeSignal       <Signal> raised on text I/O with binary-stream
@@ -184,14 +182,6 @@
 	OpenErrorSignal nameClass:self message:#openErrorSignal.
 	OpenErrorSignal notifierString:'open error'.
 
-	ReadErrorSignal := StreamErrorSignal newSignalMayProceed:false.
-	ReadErrorSignal nameClass:self message:#readErrorSignal.
-	ReadErrorSignal notifierString:'read error'.
-
-	WriteErrorSignal := StreamErrorSignal newSignalMayProceed:false.
-	WriteErrorSignal nameClass:self message:#writeErrorSignal.
-	WriteErrorSignal notifierString:'write error'.
-
 	InvalidReadSignal := ReadErrorSignal newSignalMayProceed:false.
 	InvalidReadSignal nameClass:self message:#invalidReadSignal.
 	InvalidReadSignal notifierString:'read error'.
@@ -270,22 +260,10 @@
     ^ OpenErrorSignal
 !
 
-readErrorSignal
-    "return the signal raised on read errors"
-
-    ^ ReadErrorSignal
-!
-
 streamNotOpenSignal
     "return the signal raised on I/O with closed streams"
 
     ^ StreamNotOpenSignal
-!
-
-writeErrorSignal
-    "return the signal raised on write errors"
-
-    ^ WriteErrorSignal
 ! !
 
 !ExternalStream class methodsFor:'error handling'!
@@ -3453,6 +3431,6 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.80 1995-12-19 19:15:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtStream.st,v 1.81 1995-12-23 19:05:00 cg Exp $'
 ! !
 ExternalStream initialize!
--- a/ExternalStream.st	Sat Dec 23 19:57:33 1995 +0100
+++ b/ExternalStream.st	Sat Dec 23 20:05:00 1995 +0100
@@ -12,10 +12,10 @@
 
 ReadWriteStream subclass:#ExternalStream
 	 instanceVariableNames:'filePointer mode buffered binary useCRLF hitEOF didWrite
-                lastErrorNumber'
-	 classVariableNames:'Lobby LastErrorNumber ReadErrorSignal WriteErrorSignal
-                InvalidReadSignal InvalidWriteSignal InvalidModeSignal
-                OpenErrorSignal StreamNotOpenSignal'
+		lastErrorNumber'
+	 classVariableNames:'Lobby LastErrorNumber 
+		InvalidReadSignal InvalidWriteSignal InvalidModeSignal
+		OpenErrorSignal StreamNotOpenSignal'
 	 poolDictionaries:''
 	 category:'Streams-External'
 !
@@ -137,8 +137,6 @@
 	Lobby           <Registry>      keeps track of used ext-streams (to free up FILE*'s)
 
 	StreamErrorSignal       <Signal> parent of all stream errors (see Stream class)
-	ReadErrorSignal         <Signal> raised on read errors
-	WriteErrorSignal        <Signal> raised on write errors
 	InvalidReadSignal       <Signal> raised on read from writeonly stream
 	InvalidWriteSignal      <Signal> raised on write to readonly stream 
 	InvalidModeSignal       <Signal> raised on text I/O with binary-stream
@@ -184,14 +182,6 @@
 	OpenErrorSignal nameClass:self message:#openErrorSignal.
 	OpenErrorSignal notifierString:'open error'.
 
-	ReadErrorSignal := StreamErrorSignal newSignalMayProceed:false.
-	ReadErrorSignal nameClass:self message:#readErrorSignal.
-	ReadErrorSignal notifierString:'read error'.
-
-	WriteErrorSignal := StreamErrorSignal newSignalMayProceed:false.
-	WriteErrorSignal nameClass:self message:#writeErrorSignal.
-	WriteErrorSignal notifierString:'write error'.
-
 	InvalidReadSignal := ReadErrorSignal newSignalMayProceed:false.
 	InvalidReadSignal nameClass:self message:#invalidReadSignal.
 	InvalidReadSignal notifierString:'read error'.
@@ -270,22 +260,10 @@
     ^ OpenErrorSignal
 !
 
-readErrorSignal
-    "return the signal raised on read errors"
-
-    ^ ReadErrorSignal
-!
-
 streamNotOpenSignal
     "return the signal raised on I/O with closed streams"
 
     ^ StreamNotOpenSignal
-!
-
-writeErrorSignal
-    "return the signal raised on write errors"
-
-    ^ WriteErrorSignal
 ! !
 
 !ExternalStream class methodsFor:'error handling'!
@@ -3453,6 +3431,6 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.80 1995-12-19 19:15:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.81 1995-12-23 19:05:00 cg Exp $'
 ! !
 ExternalStream initialize!
--- a/Stream.st	Sat Dec 23 19:57:33 1995 +0100
+++ b/Stream.st	Sat Dec 23 20:05:00 1995 +0100
@@ -12,7 +12,7 @@
 
 Object subclass:#Stream
 	instanceVariableNames:''
-	classVariableNames:'StreamErrorSignal PositionErrorSignal'
+	classVariableNames:'StreamErrorSignal PositionErrorSignal ReadErrorSignal WriteErrorSignal'
 	poolDictionaries:''
 	category:'Streams'
 !
@@ -48,8 +48,13 @@
 
     Class variables:
 	StreamErrorSignal       <Signal>        parent of all stream errors
+
 	PositionErrorSignal     <Signal>        position attemted on a stream
 						which does not support positioning
+
+	ReadErrorSignal         <Signal>        raised on read errors
+
+	WriteErrorSignal        <Signal>        raised on write errors
 "
 ! !
 
@@ -64,6 +69,14 @@
 	PositionErrorSignal := StreamErrorSignal newSignalMayProceed:true.
 	PositionErrorSignal nameClass:self message:#positionErrorSignal.
 	PositionErrorSignal notifierString:'stream as no concept of a position'.
+
+	ReadErrorSignal := StreamErrorSignal newSignalMayProceed:false.
+	ReadErrorSignal nameClass:self message:#readErrorSignal.
+	ReadErrorSignal notifierString:'read error'.
+
+	WriteErrorSignal := StreamErrorSignal newSignalMayProceed:false.
+	WriteErrorSignal nameClass:self message:#writeErrorSignal.
+	WriteErrorSignal notifierString:'write error'.
     ]
 ! !
 
@@ -84,6 +97,12 @@
     ^ PositionErrorSignal
 !
 
+readErrorSignal
+    "return the signal raised on read errors"
+
+    ^ ReadErrorSignal
+!
+
 streamErrorSignal
     "return the parent of all stream errors;
      handling this one also handles all other errors.
@@ -91,6 +110,12 @@
      operations, such as failed ioctls in externalStream etc."
 
     ^ StreamErrorSignal
+!
+
+writeErrorSignal
+    "return the signal raised on write errors"
+
+    ^ WriteErrorSignal
 ! !
 
 !Stream methodsFor:'accessing'!
@@ -899,6 +924,6 @@
 !Stream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.30 1995-12-13 10:27:04 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.31 1995-12-23 19:04:38 cg Exp $'
 ! !
 Stream initialize!
hg/stx-libbasic