--- a/NonPositionableExternalStream.st Tue Sep 08 11:50:34 1998 +0200
+++ b/NonPositionableExternalStream.st Tue Sep 08 11:52:43 1998 +0200
@@ -61,7 +61,7 @@
'TTYStream' or similar.
[author:]
- Claus Gittinger
+ Claus Gittinger
"
! !
@@ -154,18 +154,18 @@
l := aCollection size.
first := aCollection at:1.
[self atEnd] whileFalse:[
- buffer isNil ifTrue:[
- buffer := self nextAvailable:l.
- ].
- buffer = aCollection ifTrue:[
- ^ self
- ].
- idx := buffer indexOf:first startingAt:2.
- idx == 0 ifTrue:[
- buffer := nil
- ] ifFalse:[
- buffer := (buffer copyFrom:idx) , (self nextAvailable:(idx - 1))
- ]
+ buffer isNil ifTrue:[
+ buffer := self nextAvailable:l.
+ ].
+ buffer = aCollection ifTrue:[
+ ^ self
+ ].
+ idx := buffer indexOf:first startingAt:2.
+ idx == 0 ifTrue:[
+ buffer := nil
+ ] ifFalse:[
+ buffer := (buffer copyFrom:idx) , (self nextAvailable:(idx - 1))
+ ]
].
^ nil
@@ -204,11 +204,11 @@
self == Stdin ifTrue:[
myName := 'Stdin'.
] ifFalse:[
- self == Stdout ifTrue:[
+ self == Stdout ifTrue:[
myName := 'Stdout'.
- ] ifFalse:[
- self == Stderr ifTrue:[
- myName := 'Stderr'.
+ ] ifFalse:[
+ self == Stderr ifTrue:[
+ myName := 'Stderr'.
]
]
].
@@ -247,6 +247,14 @@
OBJ fp;
__INST(filePointer) = fp = __MKOBJ(stderr); __STORE(self, fp);
+#ifdef WIN32
+ __INST(eolMode) = @symbol(crlf);
+#else
+# ifdef xxx__VMS__ /* XXX: to be tested */
+ __INST(eolMode) = @symbol(cr);
+# endif
+#endif
+
%}
!
@@ -275,6 +283,13 @@
OBJ fp;
__INST(filePointer) = fp = __MKOBJ(stdout); __STORE(self, fp);
+#ifdef WIN32
+ __INST(eolMode) = @symbol(crlf);
+#else
+# ifdef xxx__VMS__ /* XXX: to be tested */
+ __INST(eolMode) = @symbol(cr);
+# endif
+#endif
%}
!
@@ -307,5 +322,5 @@
!NonPositionableExternalStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.31 1998-01-15 23:30:40 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.32 1998-09-08 09:52:43 cg Exp $'
! !