hg/stx-libbasic: comparison Stream.st

equal deleted inserted replaced

-:7929c3e8bb69
+:d13988bf2f1e
 isAbstract
 ^ self == Stream
 ! !
-!Stream methodsFor:'*petitparser-core-converting'!
-asPetitStream
-	^ self contents asPetitStream
-! !
 !Stream methodsFor:'Compatibility-Dolphin'!
 display:someObject
 "dolphin compatibility"
 value."
 |answerStream element|
 answerStream := self contentsSpecies writeStream.
-[self atEnd] whileFalse:[
+[(element := self nextOrNil) isNil or:[self atEnd]] whileFalse:[
-element := self next.
 answerStream nextPut:element.
 (element = anObject) ifTrue: [
 ^ answerStream contents
 ]
 ].
 Transcript showCR:(s upToEnd)
 "
 "Modified: / 17-05-1996 / 08:51:40 / cg"
 "Modified: / 10-01-2018 / 18:30:17 / stefan"
+"Modified: / 22-10-2019 / 18:52:28 / Stefan Vogel"
 !
 throughAll:aCollection
 "read & return a collection of all objects up-to and including
 a subcollection given by aCollection.
 and returned."
 |answerStream element|
 answerStream := self contentsSpecies writeStream.
-[self atEnd] whileFalse:[
+[(element := self nextOrNil) isNil and:[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).
+s := ReadStream on:#(1 nil 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 upToEnd.
 "
 "Modified: / 11-01-1998 / 15:28:04 / cg"
 "Modified: / 10-01-2018 / 18:30:25 / stefan"
+"Modified (comment): / 22-10-2019 / 19:15:20 / Stefan Vogel"
 !
 throughElementForWhich:aBlock
 "read elements until aBlock returns true for an element.
 Return the collected elements including that element.
 |answerStream element|
 answerStream := self contentsSpecies writeStream.
-[self atEnd] whileFalse:[
+[(element := self nextOrNil) isNil and:[self atEnd]] whileFalse:[
-element := self next.
 answerStream nextPut:element.
 (aBlock value:element) ifTrue: [
 ^ answerStream contents
 ]
 ].
 ^ answerStream contents
 "
 #(1 2 3 4 5 6 7 8 9 10) readStream
-throughElementForWhich:[:el | el > 5];
+throughElementForWhich:[:el | el > 5].
 "
 "Modified: / 10-01-2018 / 18:30:30 / stefan"
+"Modified (comment): / 22-10-2019 / 19:13:58 / Stefan Vogel"
 !
 upTo:anObject
 "read a collection of all objects up-to anObject and return these
 elements, but excluding anObject.
 self upTo:anObject into:answerStream.
 ^ answerStream contents
 "
 |s|
-s := '12345678901234567890' readStream.
+s := '12345678901234567890' asArray readStream.
 s readLimit:5.
 s upTo:$3.
 self assert:(s position = 3).
 s upTo:$x.
 self assert:(s position = 5).
 (ReadStream on:#(1 2 3 4 5 6)) upTo:4
 (ReadStream on:'line 1
 line 2') upTo:Character cr
-'Makefile' asFilename readStream upTo:Character cr;upTo:Character cr
+'Make.proto' asFilename readStream upTo:Character cr; upTo:Character cr
 "
 "Modified: / 12-01-1998 / 21:58:38 / cg"
 "Modified: / 10-01-2018 / 18:30:36 / stefan"
-"Modified (comment): / 24-09-2019 / 14:35:36 / Stefan Vogel"
+"Modified (comment): / 22-10-2019 / 19:41:51 / Stefan Vogel"
 !
 upTo:separatingObject into:aStream
 "read a collection of all objects up-to separatingObject and append these
 elements to aStream, but excluding anObject.
 |element|
 separatingObject isImmediate ifTrue:[
 "speed uo for anObject being an Integer or a Character <= 255
 - identity compare is inlined and a lot faster"
-[self atEnd not and:[(element := self next) ~~ separatingObject ]] whileTrue:[
+[((element := self nextOrNil) notNil or:[self atEnd not])
+and:[element ~~ separatingObject]] whileTrue:[
 aStream nextPut:element.
 ].
 ] ifFalse:[
-[self atEnd not and:[(element := self next) ~= separatingObject ]] whileTrue:[
+[((element := self nextOrNil) notNil or:[self atEnd not])
+and:[element ~= separatingObject]] whileTrue:[
 aStream nextPut:element.
 ].
 ].
 "
-|s|
+|s w|
-s := ReadStream on:'hello world world'.
+w := #() writeStream.
-Transcript show:'<'; show:(s upTo:$w); showCR:'>'.
+s := ReadStream on:#(1 2 3 4 5 'bla' 6 nil 7 8 9 theEnd).
-Transcript show:'<'; show:(s upToEnd); showCR:'>'.
+s upTo:2 into:w.
-"
+w contents.
+w reset. s reset.
-"Modified: / 30-09-2019 / 14:00:13 / Stefan Vogel"
+s upTo:'bla' into:w.
+w contents.
+w reset. s reset.
+s upTo:nil into:w.
+w contents.
+w reset. s reset.
+s upTo:#nothing into:w.
+w contents.
+w reset. s reset.
+"
+"Modified (comment): / 22-10-2019 / 19:09:12 / Stefan Vogel"
 !
 upToAllExcluding:aCollection
 "read a collection of all objects up-to a sequence of elements given in aCollection,
 and return these elements, but excluding the matching ones.
 |answerStream element last|
 last := aCollection last.
 answerStream := ReadWriteStream on:(self contentsSpecies new).
-[self atEnd] whileFalse:[
+[(element := self nextOrNil) isNil and:[self atEnd]] whileFalse:[
-element := self next.
 answerStream nextPut:element.
 element = last ifTrue:[
 (answerStream endsWith:aCollection) ifTrue:[
 |pos|
 pos := answerStream position.
 Transcript show:'<'; show:(s upToEnd); showCR:'>'.
 "
 "Created: / 15-06-1998 / 19:11:31 / cg"
 "Modified: / 10-01-2018 / 23:48:49 / stefan"
+"Modified: / 22-10-2019 / 19:12:06 / Stefan Vogel"
 !
 upToEnd
 "return a collection of the elements up-to the end.
 Return an empty collection, if the stream-end is already at the end."
-|answerStream|
+|answerStream element|
 answerStream := self contentsSpecies writeStream.
-[self atEnd] whileFalse:[
+[(element := self nextOrNil) isNil and:[self atEnd]] whileFalse:[
-answerStream nextPut:self next.
+answerStream nextPut:element.
 ].
 ^ answerStream contents
 "
 (ReadStream on:'1234567890') upToEnd
 ('12' readStream) next; next; upToEnd
 "
 "Modified: / 15-05-1996 / 18:00:39 / cg"
 "Modified (format): / 10-01-2018 / 18:30:53 / stefan"
+"Modified: / 22-10-2019 / 19:12:46 / Stefan Vogel"
 ! !
 !Stream methodsFor:'reading-numbers'!
 nextDecimalInteger
 self atEnd ifTrue:[
 ^ self pastEndRead
 ].
 answerStream := self contentsSpecies writeStream:80.
 self upTo:Character cr into:answerStream.
-(answerStream size ~~ 0 and:[answerStream last = Character return]) ifTrue:[
+(answerStream size ~~ 0 and:[answerStream last == Character return]) ifTrue:[
 answerStream backStep.
 ].
 ^ answerStream contents
 "Modified: / 19-05-1998 / 17:26:25 / cg"
 "Modified: / 10-01-2018 / 18:35:11 / stefan"
+"Modified: / 22-10-2019 / 19:37:56 / Stefan Vogel"
 ! !
 !Stream methodsFor:'stream-to-stream copy'!

changeset 24858	d13988bf2f1e
parent 24841	10cdb3672d2b
child 24862	1129d5b1f9cb