code rewritten to be independent of stream zero-base
authorClaus Gittinger <cg@exept.de>
Tue, 25 Feb 2003 12:48:10 +0100
changeset 4599 9a95e5ae08ad
parent 4598 330907eab7e0
child 4600 c26a0661b57c
code rewritten to be independent of stream zero-base
ChangesBrowser.st
FileBrowser.st
--- a/ChangesBrowser.st	Tue Feb 25 11:43:18 2003 +0100
+++ b/ChangesBrowser.st	Tue Feb 25 12:48:10 2003 +0100
@@ -2188,7 +2188,7 @@
     (changeNr between:1 and:changePositions size) ifFalse:[^ nil].
     aStream := FileStream readonlyFileNamed:changeFileName.
     aStream isNil ifTrue:[^ nil].
-    aStream position:(changePositions at:changeNr).
+    aStream position1Based:(changePositions at:changeNr).
     ^ aStream
 ! !
 
@@ -2311,7 +2311,7 @@
                  get a chunk (separated by excla)
                 "
                 aStream skipSeparators.
-                chunkPos := aStream position.
+                chunkPos := aStream position1Based.
 
 
                 sawExcla := aStream peekFor:excla.
@@ -2650,7 +2650,7 @@
                             first := true.
                             [done] whileFalse:[
                                 changeDelta := ' '.
-                                methodPos := aStream position.
+                                methodPos := aStream position1Based.
 
                                 text := aStream nextChunk.
                                 done := text isNil or:[text isEmpty].
@@ -2848,7 +2848,7 @@
             nChanges := self numberOfChanges.
 
             1 to:nChanges do:[:index |
-                inStream position:(changePositions at:index).
+                inStream position1Based:(changePositions at:index).
                 sawExcla := inStream peekFor:excla.
                 chunk := inStream nextChunk.
 
@@ -3512,7 +3512,7 @@
         excla := aStream class chunkSeparator.
 
         [changeNr >= 1] whileTrue:[
-            aStream position:(changePositions at:changeNr).
+            aStream position1Based:(changePositions at:changeNr).
             sawExcla := aStream peekFor:excla.
             chunk := aStream nextChunk.
             sawExcla ifTrue:[
@@ -3563,7 +3563,7 @@
                 ] ifFalse:[
                     CompressSnapshotInfo == true ifTrue:[
                         (chunk startsWith:snapshotPrefix) ifTrue:[
-                            str := chunk readStream position:snapshotNameIndex.
+                            str := chunk readStream position1Based:snapshotNameIndex.
                             fileName := str upTo:(Character space).
                             "
                              kludge to allow use of match-check below
@@ -5466,5 +5466,5 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.287 2003-01-27 15:55:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.288 2003-02-25 11:48:10 cg Exp $'
 ! !
--- a/FileBrowser.st	Tue Feb 25 11:43:18 2003 +0100
+++ b/FileBrowser.st	Tue Feb 25 12:48:10 2003 +0100
@@ -6206,7 +6206,7 @@
 
     (idx := aBuffer findString:'charset=') ~~ 0 ifTrue:[
         s := ReadStream on:aBuffer.
-        s position:idx - 1 + (PositionableStream zeroPosition) + 8.
+        s position1Based:idx + 8.
         s skipSeparators.
         w := s upToSeparator.
         w notNil ifTrue:[
@@ -6218,7 +6218,7 @@
     ].
     (idx := aBuffer findString:'encoding') ~~ 0 ifTrue:[
         s := ReadStream on:aBuffer.
-        s position:idx - 1 + (PositionableStream zeroPosition) + 8.
+        s position1Based:idx + 8.
         s skipSeparators.
         s peek == $: ifTrue:[
             s next.
@@ -7893,5 +7893,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.521 2003-02-24 17:00:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.522 2003-02-25 11:47:32 cg Exp $'
 ! !