--- a/MultiReadStream.st Mon Nov 18 16:17:06 2019 +0100
+++ b/MultiReadStream.st Mon Nov 18 16:17:16 2019 +0100
@@ -67,6 +67,14 @@
"Created: / 21-05-2010 / 14:26:03 / cg"
! !
+!MultiReadStream methodsFor:'accessing'!
+
+readStream
+ ^ self
+
+ "Created: / 21-05-2010 / 14:51:05 / cg"
+! !
+
!MultiReadStream methodsFor:'private'!
checkCurrentStreamAtEnd
@@ -78,7 +86,7 @@
"Created: / 21-05-2010 / 14:30:20 / cg"
! !
-!MultiReadStream methodsFor:'stream protocol'!
+!MultiReadStream methodsFor:'queries'!
atEnd
self checkCurrentStreamAtEnd.
@@ -98,22 +106,6 @@
"Created: / 21-05-2010 / 14:44:26 / cg"
!
-next
- self checkCurrentStreamAtEnd.
- streamStack isEmptyOrNil ifTrue:[^ self pastEndRead].
- ^ streamStack last next
-
- "Created: / 21-05-2010 / 14:31:23 / cg"
-!
-
-peek
- self checkCurrentStreamAtEnd.
- streamStack isEmptyOrNil ifTrue:[^ self pastEndRead].
- ^ streamStack last peek
-
- "Created: / 21-05-2010 / 14:29:06 / cg"
-!
-
position
"/ that's debatable !!
"/ the code below only makes sense, if we see the multiStream as some kind of
@@ -140,12 +132,24 @@
^ self position + 1
"Created: / 21-05-2010 / 14:52:40 / cg"
+! !
+
+!MultiReadStream methodsFor:'reading'!
+
+next
+ self checkCurrentStreamAtEnd.
+ streamStack isEmptyOrNil ifTrue:[^ self pastEndRead].
+ ^ streamStack last next
+
+ "Created: / 21-05-2010 / 14:31:23 / cg"
!
-readStream
- ^ self
+peek
+ self checkCurrentStreamAtEnd.
+ streamStack isEmptyOrNil ifTrue:[^ self pastEndRead].
+ ^ streamStack last peek
- "Created: / 21-05-2010 / 14:51:05 / cg"
+ "Created: / 21-05-2010 / 14:29:06 / cg"
! !
!MultiReadStream methodsFor:'stream stacking'!