hg/stx-libbasic: comparison Stream.st

equal deleted inserted replaced

-:d8eed4e5c60f
+:fe3af716a704
 If signalAtEnd == true, raise a signal. If its false, return nil.
 Otherwise raise the signal, but only if handled; otherwise return nil."
 signalAtEnd == true ifTrue:[
 	"/ always raise ...
-^ EndOfStreamSignal raiseIn:thisContext sender
+	^ EndOfStreamSignal raiseIn:thisContext sender
 ].
 signalAtEnd == false ifTrue:[
 	"/ never raise ...
-^ nil
+	^ nil
 ].
 ^ EndOfStreamQuerySignal raiseRequestFrom:self
 "Modified: / 11.11.1997 / 16:14:41 / cg"
 nil is returned."
 |data n|
 self binary ifTrue:[
-data := ByteArray new:count
+	data := ByteArray new:count
 ] ifFalse:[
-data := String new:count
+	data := String new:count
 ].
 n := self nextBytes:count into:data startingAt:1.
 n ~~ count ifTrue:[
-n == 0 ifTrue:[
+	n == 0 ifTrue:[
-^ nil
+	    ^ nil
-].
+	].
-data := data copyTo:n
+	data := data copyTo:n
 ].
 ^ data
 "Created: 21.6.1997 / 11:18:57 / cg"
 collection.
 Returns the number of bytes that have been actually read.
 The receiver must support reading of binary bytes.
 Notice: this method is privided here for protocol completeness
-with externalStreams - it is normally not used with other
+	     with externalStreams - it is normally not used with other
-streams."
+	     streams."
 |n "{Class: SmallInteger }"
 dstIndex|
 dstIndex := initialIndex.
 n := 0.
 [self atEnd] whileFalse:[
-n == numBytes ifTrue:[
+	n == numBytes ifTrue:[
-^ n
+	    ^ n
-].
+	].
-aCollection byteAt:dstIndex put:(self nextByte).
+	aCollection byteAt:dstIndex put:(self nextByte).
-dstIndex := dstIndex + 1.
+	dstIndex := dstIndex + 1.
-n := n + 1.
+	n := n + 1.
 ].
 ^ n
 "
 |s n buffer|
 |nR oR n|
 nR := numBytes.
 oR := initialIndex.
 [nR > 0] whileTrue:[
-n := nR.
+	n := nR.
-n > blockSize ifTrue:[n := blockSize].
+	n > blockSize ifTrue:[n := blockSize].
-n := self nextBytes:n into:aCollection startingAt:oR.
+	n := self nextBytes:n into:aCollection startingAt:oR.
-n == 0 ifTrue:[
+	n == 0 ifTrue:[
-^ numBytes - nR
+	    ^ numBytes - nR
-].
+	].
-oR := oR + n.
+	oR := oR + n.
-nR := nR - n
+	nR := nR - n
 ].
 ^ numBytes
 "Created: 24.4.1997 / 21:09:34 / cg"
 "Modified: 24.4.1997 / 21:19:50 / cg"
 |idx|
 idx := start.
 1 to:count do:[:i |
-self nextPutByte:(anObject byteAt:idx).
+	self nextPutByte:(anObject byteAt:idx).
-idx := idx + 1
+	idx := idx + 1
 ].
 ^ count
 "Created: 22.4.1997 / 10:44:09 / cg"
 !
 hi := (aNumber // 16r10000).
 lo := (aNumber \\ 16r10000).
 msbFlag ifTrue:[
-"high word first"
+	"high word first"
-w1 := hi.
+	w1 := hi.
-w2 := lo.
+	w2 := lo.
 ] ifFalse:[
-"low word first"
+	"low word first"
-w1 := lo.
+	w1 := lo.
-w2 := hi.
+	w2 := hi.
 ].
 self nextPutShort:w1 MSB:false; nextPutShort:w2 MSB:false.
 "Modified: / 1.11.1997 / 18:30:52 / cg"
 !
 "
 "Modified: 17.5.1996 / 08:51:40 / cg"
 !
+throughAny:aCollection
+"read & return a collection of all objects up-to and including
+an element contained in aCollection.
+(i.e. read until any from aCollection is encountered.)
+If no such character is encountered, all elements up to the end are read
+and returned."
+|answerStream element last|
+last := aCollection last.
+answerStream := WriteStream on:(self contentsSpecies new).
+[self atEnd] whileFalse:[
+	element := self next.
+	answerStream nextPut:element.
+	(aCollection includes:element) ifTrue:[
+	    ^ answerStream contents
+	].
+].
+^ answerStream contents
+"
+|s|
+s := ReadStream on:#(1 2 3 4 5 6 7 8).
+Transcript showCR:(s throughAny:#(3 4 5)).
+Transcript showCR:s next
+|s|
+s := ReadStream on:'hello world, this is some text'.
+Transcript showCR:(s throughAny:'wt').
+Transcript showCR:(s throughAny:'wt').
+Transcript showCR:s upToEnd.
+"
+"Modified: / 11.1.1998 / 15:28:04 / cg"
+!
 throughAll:aCollection
 "read & return a collection of all objects up-to and including
 a subcollection given by aCollection.
 (i.e. read until a ``substring'' is encountered.)
 The next read operation will return the element after aCollection.
 |answerStream element last rslt|
 last := aCollection last.
 answerStream := WriteStream on:(self contentsSpecies new).
 [self atEnd] whileFalse:[
-element := self next.
+	element := self next.
-answerStream nextPut:element.
+	answerStream nextPut:element.
-element == last ifTrue:[
+	element == last ifTrue:[
-((rslt := answerStream contents) endsWith:aCollection) ifTrue:[
+	    ((rslt := answerStream contents) endsWith:aCollection) ifTrue:[
-self position:(self position - aCollection size).
+		self position:(self position - aCollection size).
-^ rslt copyWithoutLast:aCollection size
+		^ rslt copyWithoutLast:aCollection size
-]
+	    ]
-].
+	].
 ].
 ^ answerStream contents
 "
 |s|
 |answerStream element|
 answerStream := WriteStream on:(self contentsSpecies new).
 [self atEnd] whileFalse:[
-element := self next.
+	element := self next.
-(aCollectionOfObjects includes:element) ifTrue: [
+	(aCollectionOfObjects includes:element) ifTrue: [
-^ answerStream contents
+	    ^ answerStream contents
-].
+	].
-answerStream nextPut:element.
+	answerStream nextPut:element.
 ].
 ^ answerStream contents
 "
 |s|
 s := ReadStream on:'hello world'.
-Transcript showCR:(s upToAll:(Array with:Character space)).
+Transcript showCR:(s upToAny:(Array with:Character space)).
 Transcript showCR:(s upToEnd)
-'Makefile' asFilename readStream upToAll:($A to:$Z)
+'Makefile' asFilename readStream upToAny:($A to:$Z)
 "
-"Modified: 26.2.1997 / 12:24:09 / cg"
+"Created: / 30.8.1997 / 03:02:05 / cg"
-"Created: 30.8.1997 / 03:02:05 / cg"
+"Modified: / 11.1.1998 / 15:19:18 / cg"
 !
 upToEnd
 "return a collection of the elements up-to the end.
 Return an empty collection, if the stream-end is already at the end."
 ! !
 !Stream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.66 1997-11-15 14:59:17 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.67 1998-01-12 13:13:13 cg Exp $'
 ! !
 Stream initialize!

changeset 3154	fe3af716a704
parent 3112	ccf7121ddae8
child 3169	cef3b9a6de2c