diff -r 073911af23f1 -r b94bdee97afa PositionableStream.st --- a/PositionableStream.st Thu Apr 25 15:09:18 2013 +0200 +++ b/PositionableStream.st Thu Apr 25 15:09:40 2013 +0200 @@ -596,22 +596,22 @@ read pointer after the matched subcollection. Note: this behavior is inconsistent with the other upTo.. methods, - which position after the found item. We implement the method - this way for the sake of ST80-compatibility." + which position after the found item. We implement the method + this way for the sake of ST80-compatibility." |answerStream element last rslt| last := aCollection last. answerStream := WriteStream on:(self contentsSpecies new). [self atEnd] whileFalse:[ - element := self next. - answerStream nextPut:element. - element == last ifTrue:[ - ((rslt := answerStream contents) endsWith:aCollection) ifTrue:[ - self position:(self position - aCollection size). - ^ rslt copyWithoutLast:aCollection size - ] - ]. + element := self next. + answerStream nextPut:element. + element == last ifTrue:[ + ((rslt := answerStream contents) endsWith:aCollection) ifTrue:[ + self position:(self position - aCollection size). + ^ rslt copyButLast:aCollection size + ] + ]. ]. ^ answerStream contents @@ -665,11 +665,11 @@ !PositionableStream class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.155 2013-03-22 14:20:05 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.156 2013-04-25 13:09:40 stefan Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.155 2013-03-22 14:20:05 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.156 2013-04-25 13:09:40 stefan Exp $' ! !