hg/stx-libbasic: comparison WriteStream.st

equal deleted inserted replaced

-:1d9323e0a535
+:89d51443ba6f
 (where things are written for the contents only) but may be incompatible
 with some applications. Time will show, if this is to be changed."
 |lastIndex|
-lastIndex := position - ZeroPosition.
+lastIndex := position.
 collection size == lastIndex ifFalse:[
-	collection isFixedSize ifTrue:[
+collection isFixedSize ifTrue:[
-	    "
+"
-	     grow is expensive - return a copy.
+grow is expensive - return a copy.
-	     (is this what users of writeStream expect ?)
+(is this what users of writeStream expect ?)
-	    "
+"
-	    collection := collection copyFrom:1 to:lastIndex
+collection := collection copyFrom:1 to:lastIndex
-	] ifFalse:[
+] ifFalse:[
-	    collection grow:lastIndex
+collection grow:lastIndex
-	]
+]
 ].
 ^ collection
 "Modified: / 19.2.1997 / 08:57:28 / stefan"
 "Modified: / 30.10.1997 / 16:21:23 / cg"
 last
 "return the last element - report an error if the stream is empty"
 |position1Based|
-position1Based := position - ZeroPosition + 1.
+position1Based := position + 1.
 ^ collection at:(position1Based - 1).
 "
 |s|
 "return the last n elements as species of the underlying collection;
 Report an error if the stream is empty"
 |position1Based|
-position1Based := position - ZeroPosition + 1.
+position1Based := position + 1.
 ^ collection copyFrom:(position1Based - n) to:(position1Based - 1).
 "
 |s|
 position0Based:index0Based
 "redefined to allow positioning past the readLimit"
 ((index0Based > collection size) or:[index0Based < 0]) ifTrue: [^ self positionError].
-position := index0Based + ZeroPosition
+position := index0Based
 ! !
 !WriteStream methodsFor:'private'!
 growCollection
 !
 size
 "return the current size"
-^ position - ZeroPosition
+^ position
 ! !
 !WriteStream methodsFor:'reading'!
 next
 !WriteStream methodsFor:'testing'!
 isEmpty
 "return true, if the contents of the stream is empty"
-^ self position0Based == ZeroPosition
+^ self position0Based == 0
 "Created: 14.10.1997 / 20:44:37 / cg"
 ! !
 !WriteStream methodsFor:'writing'!
 (collection isNil or:[writeLimit notNil]) ifTrue:[
 super next:count put:anObject.
 ^ self.
 ].
-position1Based := position - ZeroPosition + 1.
+position1Based := position + 1.
 final := position1Based + count - 1.
 (final > collection size) ifTrue:[
 self growCollection:final
 ].
 position1Based to:final do:[:index |
 collection at:index put:anObject.
 ].
 position1Based := position1Based + count.
 (position1Based > readLimit) ifTrue:[readLimit := position1Based - 1].
-position := position1Based - 1 + ZeroPosition.
+position := position1Based - 1.
 "/ ^ anObject -- return self
 !
 next:n putAll:aCollection startingAt:pos1
 "append some elements of the argument, aCollection to the stream."
 p = __INST(position);
 if (__isNonNilObject(coll) && __isSmallInteger(p)) {
 pos = __intVal(p);
 /* make 1-based */
-pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
+pos = pos + 1;
 wL = __INST(writeLimit);
 if ((wL == nil)
 || (__isSmallInteger(wL) && (pos <= __intVal(wL)))) {
 OBJ cls;
 }
 }
 #endif
 %}.
 (writeLimit isNil
-or:[(position + 1 - ZeroPosition) <= writeLimit]) ifTrue:[
+or:[(position + 1) <= writeLimit]) ifTrue:[
-((position + 1 - ZeroPosition) > collection size) ifTrue:[self growCollection].
+(position >= collection size) ifTrue:[self growCollection].
-collection at:(position + 1 - ZeroPosition) put:anObject.
+collection at:(position + 1) put:anObject.
-((position + 1 - ZeroPosition) > readLimit) ifTrue:[readLimit := (position + 1 - ZeroPosition)].
+(position >= readLimit) ifTrue:[readLimit := (position + 1)].
 position := position + 1.
 ] ifFalse:[
 WriteError raiseErrorString:'write beyond writeLimit'
 ].
 ^anObject
 aCollection isSequenceable ifFalse:[
 super nextPutAll:aCollection.
 ^ self.
 ].
-position1Based := position - ZeroPosition + 1.
+position1Based := position + 1.
 nMore := aCollection size.
 nMore == 0 ifTrue:[
 "/ for the programmer..
 aCollection isCollection ifFalse:[
 with:aCollection
 startingAt:1.
 position1Based := position1Based + nMore.
 (position1Based > readLimit) ifTrue:[readLimit := position1Based - 1].
-position := position1Based - 1 + ZeroPosition.
+position := position1Based - 1.
 "/ ^ aCollection -- self
 "Modified: / 04-09-2011 / 20:03:32 / cg"
 !
 collection isNil ifTrue:[
 ^ super nextPutAll:aCollection startingAt:pos1 to:pos2
 ].
-position1Based := position - ZeroPosition + 1.
+position1Based := position + 1.
 nMore := pos2 - pos1 + 1.
 final := position1Based + nMore - 1.
 (writeLimit notNil
 and:[final > writeLimit]) ifTrue:[
 final := writeLimit.
 with:aCollection
 startingAt:pos1.
 position1Based := position1Based + nMore.
 (position1Based > readLimit) ifTrue:[readLimit := position1Based - 1].
-position := position1Based - 1 + ZeroPosition.
+position := position1Based - 1.
 "/ ^ aCollection -- return self
 "
 |s|
 ! !
 !WriteStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/WriteStream.st,v 1.76 2013-04-26 14:11:10 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/WriteStream.st,v 1.78 2013-06-03 18:39:07 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/WriteStream.st,v 1.76 2013-04-26 14:11:10 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/WriteStream.st,v 1.78 2013-06-03 18:39:07 cg Exp $'
 ! !

branch	jv
changeset 18066	89d51443ba6f
parent 18057	8da7c39a6322
parent 15354	21ebb380b376
child 18071	009cf668b0ed