# HG changeset patch # User Claus Gittinger # Date 1370281777 -7200 # Node ID 7c2c460c5feb37b0ba7baaa9c7c6bb6cd31e9543 # Parent f5677dc62dc04cf68c6eab3fe7ffd52ef074ae4e class: CharacterWriteStream changed: #characterSizeChanged: #nextPut: eliminated ZeroPosition diff -r f5677dc62dc0 -r 7c2c460c5feb CharacterWriteStream.st --- a/CharacterWriteStream.st Mon Jun 03 19:48:26 2013 +0200 +++ b/CharacterWriteStream.st Mon Jun 03 19:49:37 2013 +0200 @@ -89,7 +89,7 @@ bitsPerCharacter := aCharacterOrString bitsPerCharacter. currentCharacterSize < bitsPerCharacter ifTrue:[ sz := collection size. - (position + 1 - ZeroPosition) > sz ifTrue:[ + (position + 1) > sz ifTrue:[ newSz := sz + 1. ] ifFalse:[ newSz := sz. @@ -152,7 +152,7 @@ if (__isNonNilObject(coll) && __isSmallInteger(p) && __isCharacter(aCharacter)) { pos = __intVal(p); /* make 1-based */ - pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition)); + pos = pos + 1; wL = __INST(writeLimit); if ((wL == nil) @@ -209,13 +209,13 @@ (writeLimit isNil - or:[(position + 1 - ZeroPosition) <= writeLimit]) ifTrue:[ + or:[(position + 1) <= writeLimit]) ifTrue:[ currentCharacterSize < aCharacter bitsPerCharacter ifTrue:[ self characterSizeChanged:aCharacter ]. - ((position + 1 - ZeroPosition) > collection size) ifTrue:[self growCollection]. - collection at:(position + 1 - ZeroPosition) put:aCharacter. - ((position + 1 - ZeroPosition) > readLimit) ifTrue:[readLimit := (position + 1 - ZeroPosition)]. + ((position + 1) > collection size) ifTrue:[self growCollection]. + collection at:(position + 1) put:aCharacter. + ((position + 1) > readLimit) ifTrue:[readLimit := (position + 1)]. position := position + 1. ] ifFalse:[ WriteError raiseErrorString:'write beyond writeLimit' @@ -251,10 +251,10 @@ !CharacterWriteStream class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/CharacterWriteStream.st,v 1.10 2012-12-18 21:35:06 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/CharacterWriteStream.st,v 1.11 2013-06-03 17:49:37 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libbasic/CharacterWriteStream.st,v 1.10 2012-12-18 21:35:06 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/CharacterWriteStream.st,v 1.11 2013-06-03 17:49:37 cg Exp $' ! !