ReadStream.st
author Stefan Vogel <sv@exept.de>
Tue, 05 Jun 2007 17:57:48 +0200
changeset 10598 75ba1ed5a12b
parent 10597 2ce737e46648
child 10599 0658b3c147db
permissions -rw-r--r--
Faster #upToEnd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     2
 COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
     3
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
5810
3de0efaab65c checkin from browser
frank
parents: 5310
diff changeset
    12
"{ Package: 'stx:libbasic' }"
3de0efaab65c checkin from browser
frank
parents: 5310
diff changeset
    13
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    14
PositionableStream subclass:#ReadStream
970
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    15
	instanceVariableNames:''
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    16
	classVariableNames:''
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    17
	poolDictionaries:''
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    18
	category:'Streams'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    19
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    20
2162
7e1601f633b6 ff is a separator too (in #skipSeparators*)
Claus Gittinger <cg@exept.de>
parents: 1688
diff changeset
    21
!ReadStream class methodsFor:'documentation'!
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    22
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    23
copyright
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    24
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    25
 COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    26
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    27
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    28
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    29
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    30
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    31
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    32
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    33
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    34
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    35
!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    36
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    37
documentation
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    38
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    39
    ReadStream defines protocol for reading streamwise over collections. 
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1138
diff changeset
    40
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1138
diff changeset
    41
    [author:]
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
    42
	Claus Gittinger
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1138
diff changeset
    43
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    44
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    45
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    46
9305
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    47
!ReadStream class methodsFor:'blocked instance creation'!
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    48
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    49
with:aCollection
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    50
    "with on readStream makes no sense 
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    51
     - what do you want to read from the end of a collection?"
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    52
    <resource:#obsolete>
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    53
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    54
    self obsoleteMethodWarning:'WARNING: with: should not be used for ReadStreams - use #on:'.
9305
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    55
    ^ super with:aCollection
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    56
! !
8987
b0d7be646112 #nextBytes:into:startingAt: now works, when fetching into a bit array.
Stefan Vogel <sv@exept.de>
parents: 8914
diff changeset
    57
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    58
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    59
!ReadStream methodsFor:'converting'!
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    60
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    61
readStream
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    62
    "return a readStream from the receiver. Since this is already
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    63
     a readStream, return self."
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    64
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    65
    ^ self
8140
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    66
!
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    67
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    68
readStreamOrNil
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    69
    "return a readStream from the receiver. Since this is already
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    70
     a readStream, return self.
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    71
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    72
     This method has been defined for protocol copmatibility with Filename"
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    73
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
    74
    ^ self
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    75
! !
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    76
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    77
!ReadStream methodsFor:'emphasis'!
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    78
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    79
emphasis
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    80
    "return the emphasis of the current (i.e. next returned by #next)
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    81
     element. Streams on a string will return nil for all elements.
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    82
     Streams on collections which nothing at all about emphasises, 
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    83
     will report an error."
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    84
7114
acc13967229e position fixes
Claus Gittinger <cg@exept.de>
parents: 7051
diff changeset
    85
    ^ collection emphasisAt:(position - ZeroPosition + 1).
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    86
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    87
    "
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    88
     |t s|
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    89
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    90
     t := 'hello world' asText
7114
acc13967229e position fixes
Claus Gittinger <cg@exept.de>
parents: 7051
diff changeset
    91
                emphasizeFrom:1 to:5 with:#bold;
acc13967229e position fixes
Claus Gittinger <cg@exept.de>
parents: 7051
diff changeset
    92
                emphasizeFrom:7 to:11 with:#italic.
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    93
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    94
     s := t readStream.
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    95
     [s atEnd] whileFalse:[
7114
acc13967229e position fixes
Claus Gittinger <cg@exept.de>
parents: 7051
diff changeset
    96
        Transcript show:(s emphasis); show:' '.
acc13967229e position fixes
Claus Gittinger <cg@exept.de>
parents: 7051
diff changeset
    97
        Transcript show:''''; show:(s next); showCR:''''.
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    98
     ].
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
    99
    "
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   100
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   101
    "Modified: 15.5.1996 / 17:30:33 / cg"
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   102
! !
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   103
345
claus
parents: 329
diff changeset
   104
!ReadStream methodsFor:'queries'!
claus
parents: 329
diff changeset
   105
5310
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   106
copyFrom:beginning to:end
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   107
    ^ collection copyFrom:beginning to:end
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   108
!
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   109
345
claus
parents: 329
diff changeset
   110
isReadable
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   111
    "return true, if reading is supported by the recevier.
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   112
     Here, true is always returned."
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   113
345
claus
parents: 329
diff changeset
   114
    ^ true
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   115
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   116
    "Modified: 4.10.1997 / 17:59:21 / cg"
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   117
!
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   118
6315
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   119
isWritable
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   120
    "return true, if writing is supported by the recevier.
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   121
     This has to be redefined in concrete subclasses."
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   122
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   123
    ^ false
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   124
!
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   125
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   126
size
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   127
    "return the number of elements in the streamed collection."
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   128
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   129
    ^ collection size
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   130
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   131
    "Created: 13.9.1996 / 18:14:35 / cg"
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   132
    "Modified: 4.10.1997 / 17:59:45 / cg"
345
claus
parents: 329
diff changeset
   133
! !
claus
parents: 329
diff changeset
   134
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   135
!ReadStream methodsFor:'reading'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   136
a27a279701f8 Initial revision
claus
parents:
diff changeset
   137
next
a27a279701f8 Initial revision
claus
parents:
diff changeset
   138
    "return the next element; advance read pointer.
2
claus
parents: 1
diff changeset
   139
     return nil, if there is no next element.
345
claus
parents: 329
diff changeset
   140
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   141
a27a279701f8 Initial revision
claus
parents:
diff changeset
   142
    |ret|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   143
a27a279701f8 Initial revision
claus
parents:
diff changeset
   144
%{  /* NOCONTEXT */
a27a279701f8 Initial revision
claus
parents:
diff changeset
   145
a27a279701f8 Initial revision
claus
parents:
diff changeset
   146
    REGISTER int pos;
a27a279701f8 Initial revision
claus
parents:
diff changeset
   147
    unsigned ch;
252
   148
    OBJ coll, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   149
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   150
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   151
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   152
    l = __INST(readLimit);
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   153
252
   154
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
   155
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   156
        pos = __intVal(p);
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   157
        /* make 1-based */
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   158
        pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   159
        if (pos > 0 && pos <= __intVal(l)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   160
            OBJ cls, ret;
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   161
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   162
            cls = __qClass(coll);
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   163
            if (cls == @global(String)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   164
                if (pos <= __stringSize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   165
                    ch = __stringVal(coll)[pos-1];
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   166
                    ret = __MKCHARACTER(ch);
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   167
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   168
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   169
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   170
            } else if (cls == @global(ByteArray)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   171
                if (pos <= __byteArraySize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   172
                    ch = __ByteArrayInstPtr(coll)->ba_element[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   173
                    ret = __mkSmallInteger(ch);
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   174
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   175
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   176
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   177
            } else if (cls == @global(Unicode16String)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   178
                if (pos <= __unicode16StringSize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   179
                    ch = __Unicode16StringInstPtr(coll)->s_element[pos-1];
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   180
                    ret = __MKUCHARACTER(ch);
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   181
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   182
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   183
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   184
            } else if (cls == @global(Array)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   185
                if (pos <= __arraySize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   186
                    ret = __ArrayInstPtr(coll)->a_element[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   187
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   188
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   189
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   190
            }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   191
        }
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   192
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   193
%}.
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   194
    ((position + 1 - ZeroPosition) > readLimit) ifTrue:[^ self pastEndRead].
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   195
    ret := collection at:(position + 1 - ZeroPosition).
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   196
    position := position + 1.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   197
    ^ ret
a27a279701f8 Initial revision
claus
parents:
diff changeset
   198
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   199
252
   200
nextAlphaNumericWord
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   201
    "read the next word (i.e. up to non letter-or-digit).
a27a279701f8 Initial revision
claus
parents:
diff changeset
   202
     return a string containing those characters.
3112
ccf7121ddae8 nextAlphaNumericWord changed
Claus Gittinger <cg@exept.de>
parents: 2997
diff changeset
   203
     Skips any non-alphanumeric chars first.
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   204
     - tuned for speed on String-Streams for faster scanning"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   205
%{
a27a279701f8 Initial revision
claus
parents:
diff changeset
   206
    /* speedup, if collection is a string */
a27a279701f8 Initial revision
claus
parents:
diff changeset
   207
a27a279701f8 Initial revision
claus
parents:
diff changeset
   208
    int pos, limit, sz;
a27a279701f8 Initial revision
claus
parents:
diff changeset
   209
    int len;
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   210
    char buffer[256];
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   211
    REGISTER unsigned char *cp;
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   212
    REGISTER unsigned ch;
252
   213
    OBJ coll, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   214
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   215
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   216
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   217
    l = __INST(readLimit);
252
   218
    
   219
    if (__isString(coll) && __bothSmallInteger(p, l)) {
   220
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   221
	pos = __intVal(p);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   222
	/* make 1-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   223
	pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   224
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   225
	limit = __intVal(l);
329
claus
parents: 252
diff changeset
   226
	sz = __qSize(coll) - OHDR_SIZE;
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   227
	if (sz < limit)
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   228
	    limit = sz; 
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   229
	cp = __stringVal(coll) + pos - 1;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   230
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   231
	for (;;) {
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   232
	    if (pos > limit) break;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   233
	    ch = *cp;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   234
3112
ccf7121ddae8 nextAlphaNumericWord changed
Claus Gittinger <cg@exept.de>
parents: 2997
diff changeset
   235
	    if (((ch >= 'a') && (ch <= 'z')) ||
ccf7121ddae8 nextAlphaNumericWord changed
Claus Gittinger <cg@exept.de>
parents: 2997
diff changeset
   236
		((ch >= 'A') && (ch <= 'Z')) ||
ccf7121ddae8 nextAlphaNumericWord changed
Claus Gittinger <cg@exept.de>
parents: 2997
diff changeset
   237
		((ch >= '0') && (ch <= '9')))
ccf7121ddae8 nextAlphaNumericWord changed
Claus Gittinger <cg@exept.de>
parents: 2997
diff changeset
   238
		break;
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   239
	    cp++;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   240
	    pos++;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   241
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   242
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   243
	len = 0;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   244
	for (;;) {
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   245
	    if (pos > limit) break;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   246
	    ch = *cp & 0xFF;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   247
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   248
	    if (! (((ch >= 'a') && (ch <= 'z')) ||
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   249
		   ((ch >= 'A') && (ch <= 'Z')) ||
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   250
		   ((ch >= '0') && (ch <= '9'))))
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   251
		break;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   252
	    buffer[len++] = ch;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   253
	    if (len >= (sizeof(buffer)-1)) {
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   254
		/* emergency */
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   255
		break;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   256
	    }
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   257
	    pos++;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   258
	    cp++;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   259
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   260
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   261
	/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   262
	pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   263
	__INST(position) = __mkSmallInteger(pos);
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   264
	buffer[len] = '\0';
1688
8a42db1eea60 removed all COMMA_CON / CON_COMMA uses
Claus Gittinger <cg@exept.de>
parents: 1665
diff changeset
   265
	RETURN ( (len != 0) ? __MKSTRING_L(buffer, len) : nil );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   266
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
   267
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
   268
.
252
   269
    ^ super nextAlphaNumericWord
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   270
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   271
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   272
nextByte
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   273
    "return the next element; advance read pointer.
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   274
     return nil, if there is no next element.
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   275
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   276
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   277
    |ret|
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   278
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   279
%{  /* NOCONTEXT */
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   280
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   281
    REGISTER int pos;
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   282
    unsigned ch;
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   283
    OBJ coll, p, l;
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   284
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   285
    coll = __INST(collection);
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   286
    p = __INST(position);
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   287
    l = __INST(readLimit);
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   288
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   289
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   290
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   291
        pos = __intVal(p);
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   292
        /* make 1-based */
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   293
        pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   294
        if (pos > 0 && pos <= __intVal(l)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   295
            OBJ cls, ret;
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   296
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   297
            cls = __qClass(coll);
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   298
            if (cls == @global(String)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   299
                if (pos <= __stringSize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   300
                    ch = __stringVal(coll)[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   301
                    ret = __mkSmallInteger(ch);
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   302
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   303
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   304
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   305
            } else if (cls == @global(ByteArray)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   306
                if (pos <= __byteArraySize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   307
                    ch = __ByteArrayInstPtr(coll)->ba_element[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   308
                    ret = __mkSmallInteger(ch);
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   309
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   310
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   311
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   312
            } else if (cls == @global(Array)) {
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   313
                if (pos <= __arraySize(coll)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   314
                    ret = __ArrayInstPtr(coll)->a_element[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   315
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   316
                    RETURN ( ret );
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   317
                }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   318
            }
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   319
        }
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   320
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   321
%}.
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   322
    ((position + 1 - ZeroPosition) > readLimit) ifTrue:[^ self pastEndRead].
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   323
    ret := collection at:(position + 1 -ZeroPosition).
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   324
    position := position + 1.
8098
8d1d5cd8529b nextByte should (at least) return integer when reading from a string-stream
Claus Gittinger <cg@exept.de>
parents: 7483
diff changeset
   325
    ^ ret asInteger
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   326
!
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   327
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   328
nextBytes:numBytes into:aCollection startingAt:initialIndex
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   329
    "return the next numBytes from the stream. If the end is
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   330
     reached before, only that many bytes are copyied into the
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   331
     collection.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   332
     Returns the number of bytes that have been actually read.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   333
     The receiver must support reading of binary bytes.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   334
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   335
     Notice: this method is provided here for protocol completeness
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   336
             with externalStreams - it is normally not used with other
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   337
             streams."
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   338
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   339
    ((initialIndex + numBytes - 1) <= aCollection size 
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   340
        and:[(position + numBytes) <= readLimit 
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   341
        and:[collection isByteCollection 
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   342
        and:[aCollection isByteCollection
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   343
    ]]]) ifTrue:[
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   344
        "do it the fast way"
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   345
        aCollection 
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   346
            replaceBytesFrom:initialIndex to:(initialIndex + numBytes - 1) 
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   347
            with:collection startingAt:position+1.
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   348
        position := position + numBytes.
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   349
        ^ numBytes
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   350
    ].
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   351
    "do it the hard way"
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   352
    ^ super nextBytes:numBytes into:aCollection startingAt:initialIndex
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   353
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   354
    "
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   355
     |s n buffer|
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   356
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   357
     buffer := ByteArray new:10.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   358
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   359
     s := ReadStream on:#[1 2 3 4 5 6 7 8 9].
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   360
     s next:3.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   361
     n := s nextBytes:9 into:buffer startingAt:1.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   362
     Transcript showCR:('n = %1; buffer = <%2>' bindWith:n with:buffer)
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   363
    "
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   364
!
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   365
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   366
nextDecimalInteger
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   367
    "read the next integer in radix 10. dont skip whitespace.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   368
     - tuned for speed on String-Streams for faster scanning"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   369
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   370
    |value nextOne|
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   371
%{
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   372
    int pos, limit, sz;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   373
    REGISTER unsigned char *cp;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   374
    REGISTER unsigned ch;
8914
Claus Gittinger <cg@exept.de>
parents: 8913
diff changeset
   375
    INT val = 0;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   376
    OBJ coll, p, l;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   377
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   378
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   379
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   380
    l = __INST(readLimit);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   381
    
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   382
    if (__isString(coll) && __bothSmallInteger(p, l)) {
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   383
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   384
	pos = __intVal(p);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   385
	/* make 1-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   386
	pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   387
	limit = __intVal(l);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   388
	sz = __qSize(coll) - OHDR_SIZE;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   389
	if (sz < limit)
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   390
	    limit = sz; 
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   391
	cp = __stringVal(coll) + pos - 1;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   392
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   393
	for (;;) {
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   394
	    if (pos > limit) break;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   395
	    ch = *cp;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   396
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   397
	    if ((ch < '0') || (ch > '9')) break;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   398
	    val = val * 10 + (ch - '0');
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   399
	    pos++;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   400
	    if (val > (_MAX_INT / 10)) goto oops;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   401
	    cp++;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   402
	}
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   403
	/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   404
	pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   405
	__INST(position) = __mkSmallInteger(pos);
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   406
	RETURN (__mkSmallInteger(val));
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   407
    }
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   408
oops:
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   409
    value = __mkSmallInteger(val);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   410
%}
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   411
.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   412
    "fall-back for non-string streams - we have to continue where
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   413
     above primitive left off, in case of a large integer ...
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   414
     (instead of doing a super nextDecimalInteger)"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   415
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   416
    nextOne := self peek.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   417
    [nextOne notNil and:[nextOne isDigitRadix:10]] whileTrue:[
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   418
	value = (value * 10) + nextOne digitValue.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   419
	nextOne := self nextPeek
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   420
    ].
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   421
    ^ value
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   422
!
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   423
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   424
nextOrNil
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   425
    "return the next element; advance read pointer.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   426
     return nil, if there is no next element.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   427
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   428
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   429
    |ret|
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   430
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   431
%{  /* NOCONTEXT */
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   432
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   433
    REGISTER int pos;
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   434
    unsigned ch;
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   435
    OBJ coll, p, l;
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   436
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   437
    coll = __INST(collection);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   438
    p = __INST(position);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   439
    l = __INST(readLimit);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   440
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   441
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   442
        pos = __intVal(p);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   443
        /* make 1-based */
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   444
        pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   445
        if (pos > 0) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   446
            OBJ cls, ret;
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   447
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   448
            if (pos > __intVal(l)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   449
                RETURN(nil);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   450
            }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   451
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   452
            cls = __qClass(coll);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   453
            if (cls == @global(String)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   454
                if (pos <= __stringSize(coll)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   455
                    ch = __stringVal(coll)[pos-1];
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   456
                    ret = __MKCHARACTER(ch);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   457
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   458
                    RETURN ( ret );
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   459
                }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   460
            } else if (cls == @global(ByteArray)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   461
                if (pos <= __byteArraySize(coll)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   462
                    ch = __ByteArrayInstPtr(coll)->ba_element[pos-1];
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   463
                    ret = __mkSmallInteger(ch);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   464
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   465
                    RETURN ( ret );
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   466
                }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   467
            } else if (cls == @global(Unicode16String)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   468
                if (pos <= __unicode16StringSize(coll)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   469
                    ch = __Unicode16StringInstPtr(coll)->s_element[pos-1];
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   470
                    ret = __MKUCHARACTER(ch);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   471
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   472
                    RETURN ( ret );
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   473
                }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   474
            } else if (cls == @global(Array)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   475
                if (pos <= __arraySize(coll)) {
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   476
                    ret = __ArrayInstPtr(coll)->a_element[pos-1];
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   477
                    __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   478
                    RETURN ( ret );
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   479
                }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   480
            }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   481
        }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   482
    }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   483
%}.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   484
    ret := collection at:(position + 1 - ZeroPosition).
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   485
    position := position + 1.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   486
    ^ ret
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   487
!
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   488
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   489
nextPeek
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   490
    "advance read pointer return the peek element.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   491
     this is equivalent to (self next; peek).
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   492
     - tuned for speed on String-Streams for faster scanning"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   493
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   494
%{  /* NOCONTEXT */
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   495
    OBJ coll, l, p;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   496
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   497
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   498
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   499
    l = __INST(readLimit);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   500
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   501
    if (__isString(coll) && __bothSmallInteger(p, l)) {
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   502
        REGISTER int pos;
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   503
        unsigned ch;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   504
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   505
        pos = __intVal(p);
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   506
        /* make 1-based */
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   507
        pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   508
        if ((pos > 0) && (pos < __intVal(l)) && (pos < __stringSize(coll))) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   509
            pos = pos + 1;
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   510
            ch = __stringVal(coll)[pos-1];
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   511
            /* make ZeroPosition-based */
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   512
            pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   513
            __INST(position) = __mkSmallInteger(pos);
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   514
            RETURN ( __MKCHARACTER(ch) );
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   515
        }
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   516
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   517
%}.
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   518
    ((position + 1 - ZeroPosition) > readLimit) ifTrue:[^ self pastEndRead].
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   519
    position := position + 1.
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   520
    ((position + 1 - ZeroPosition) > readLimit) ifTrue:[^ self pastEndRead].
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   521
    ^ collection at:(position + 1 - ZeroPosition)
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   522
!
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   523
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   524
peek
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   525
    "return the next element; do NOT advance read pointer.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   526
     return nil, if there is no next element.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   527
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   528
a27a279701f8 Initial revision
claus
parents:
diff changeset
   529
%{  /* NOCONTEXT */
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   530
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   531
    REGISTER int pos;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   532
    unsigned ch;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   533
    OBJ coll;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   534
    OBJ cls, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   535
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   536
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   537
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   538
    l = __INST(readLimit);
252
   539
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   540
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   541
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   542
        pos = __intVal(p);
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   543
        /* make 1-based */
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   544
        pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   545
        if (pos <= __intVal(l) && pos > 0) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   546
            cls = __qClass(coll);
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   547
            if (cls == @global(String)) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   548
                if (pos <= __stringSize(coll)) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   549
                    ch = __stringVal(coll)[pos-1];
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   550
                    RETURN ( __MKCHARACTER(ch) );
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   551
                }
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   552
            } else if (cls == @global(ByteArray)) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   553
                if (pos <= __byteArraySize(coll)) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   554
                    ch = __ByteArrayInstPtr(coll)->ba_element[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   555
                    RETURN ( __mkSmallInteger(ch) );
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   556
                }
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   557
            } else if (cls == @global(Array)) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   558
                if (pos <= __arraySize(coll)) {
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   559
                    RETURN ( __ArrayInstPtr(coll)->a_element[pos-1]);
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   560
                }
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   561
            }
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   562
        }
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   563
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   564
%}.
8614
88421fbd4ab6 pastEnd -> pastEndRead
Claus Gittinger <cg@exept.de>
parents: 8530
diff changeset
   565
    ((position + 1 - ZeroPosition) > readLimit) ifTrue:[^ self pastEndRead].
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   566
    ^ collection at:(position + 1 - ZeroPosition)
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   567
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   568
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   569
peekOrNil
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   570
    "return the next element; do NOT advance read pointer.
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   571
     return nil, if there is no next element.
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   572
     This is much like #peek -
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   573
     However, unlike #peek, this does not raise an atEnd-query signal - even
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   574
     if handled. Instead, nil is returned immediately."
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   575
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   576
%{  /* NOCONTEXT */
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   577
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   578
    REGISTER int pos;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   579
    unsigned ch;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   580
    OBJ coll;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   581
    OBJ cls, p, l;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   582
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   583
    coll = __INST(collection);
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   584
    p = __INST(position);
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   585
    l = __INST(readLimit);
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   586
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   587
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   588
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   589
	pos = __intVal(p);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   590
	/* make 1-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   591
	pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   592
	if (pos <= __intVal(l) && pos > 0) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   593
	    cls = __qClass(coll);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   594
	    if (cls == @global(String)) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   595
		if (pos <= __stringSize(coll)) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   596
		    ch = __stringVal(coll)[pos-1];
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   597
		    RETURN ( __MKCHARACTER(ch) );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   598
		}
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   599
		RETURN ( nil );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   600
	    } else if (cls == @global(ByteArray)) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   601
		if (pos <= __byteArraySize(coll)) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   602
		    ch = __ByteArrayInstPtr(coll)->ba_element[pos-1];
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   603
		    RETURN ( __mkSmallInteger(ch) );
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   604
		}
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   605
		RETURN ( nil );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   606
	    } else if (cls == @global(Array)) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   607
		if (pos <= __arraySize(coll)) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   608
		    RETURN ( __ArrayInstPtr(coll)->a_element[pos-1]);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   609
		}
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   610
		RETURN ( nil );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   611
	    }
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   612
	}
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   613
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   614
%}.
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   615
    ((position + 1 - ZeroPosition) > readLimit) ifTrue:[^ nil].
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   616
    ^ collection at:(position + 1 - ZeroPosition)
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   617
!
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   618
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   619
skipSeparators
a27a279701f8 Initial revision
claus
parents:
diff changeset
   620
    "skip all whitespace; next will return next non-white-space element.
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   621
     Return the peeked character or nil, if the end-of-stream was reached.
2
claus
parents: 1
diff changeset
   622
     - reimplemented for speed on String-Streams for faster scanning"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   623
a27a279701f8 Initial revision
claus
parents:
diff changeset
   624
%{  /* NOCONTEXT */
252
   625
    OBJ coll, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   626
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   627
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   628
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   629
    l = __INST(readLimit);
252
   630
   631
    if (__isString(coll) && __bothSmallInteger(p, l)) {
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   632
	REGISTER unsigned char *chars;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   633
	REGISTER unsigned ch;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   634
	REGISTER int pos;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   635
	int limit;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   636
	int sz;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   637
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   638
	pos = __intVal(p);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   639
	/* make 1-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   640
	pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   641
	if (pos <= 0) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   642
	    RETURN ( nil );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   643
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   644
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   645
	limit = __intVal(l);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   646
	sz = __qSize(coll) - OHDR_SIZE;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   647
	if (limit > sz) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   648
	    limit = sz;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   649
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   650
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   651
	chars = (unsigned char *)(__stringVal(coll) + pos - 1);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   652
	while (pos <= limit) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   653
	    pos++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   654
	    ch = *chars++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   655
	    if ((ch > 0x20)
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   656
	     || ((ch != ' ')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   657
		 && (ch != '\t')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   658
		 && (ch != '\r')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   659
		 && (ch != '\n')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   660
		 && (ch != '\f')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   661
		 && (ch != 0x0B))) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   662
		/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   663
		pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   664
		__INST(position) = __mkSmallInteger(pos-1);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   665
		RETURN ( __MKCHARACTER(ch) );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   666
	    }
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   667
	}
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   668
	/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   669
	pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   670
	__INST(position) = __mkSmallInteger(pos);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   671
	RETURN ( nil );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   672
    }
1406
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   673
%}.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   674
    ^ super skipSeparators
1406
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   675
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   676
    "
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   677
     |s|
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   678
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   679
     s := '     hello     world    ' readStream.
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   680
     s skipSeparators.
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   681
     s next.
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   682
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   683
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   684
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   685
skipSeparatorsExceptCR
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   686
    "skip all whitespace except newlines;
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   687
     next will return next non-white-space element.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   688
     - reimplemented for speed on String-Streams for faster scanning"
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   689
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   690
%{  /* NOCONTEXT */
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   691
252
   692
    OBJ coll, p, l;
   693
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   694
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   695
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   696
    l = __INST(readLimit);
252
   697
   698
    if (__isString(coll) && __bothSmallInteger(p, l)) {
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   699
	REGISTER unsigned char *chars;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   700
	REGISTER unsigned ch;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   701
	REGISTER int pos;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   702
	int limit;
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   703
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   704
	pos = __intVal(p);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   705
	/* make 1-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   706
	pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   707
	if (pos <= 0) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   708
	    RETURN ( nil );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   709
	}
2162
7e1601f633b6 ff is a separator too (in #skipSeparators*)
Claus Gittinger <cg@exept.de>
parents: 1688
diff changeset
   710
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   711
	limit = __intVal(l);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   712
	if (limit > (__qSize(coll) - OHDR_SIZE))
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   713
	    limit = __qSize(coll) - OHDR_SIZE;
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   714
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   715
	chars = (unsigned char *)(__stringVal(coll) + pos - 1);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   716
	while (pos <= limit) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   717
	    ch = *chars++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   718
	    if (((int)ch > 0x20)
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   719
	     || (
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   720
		 (ch != ' ') 
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   721
		 && (ch != '\t')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   722
		 && (ch != '\f')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   723
		 && (ch != '\b')
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   724
		 && (ch != 0x0B))) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   725
		/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   726
		pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   727
		__INST(position) = __mkSmallInteger(pos);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   728
		RETURN ( __MKCHARACTER(ch) );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   729
	    }
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   730
	    pos++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   731
	}
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   732
	/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   733
	pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   734
	__INST(position) = __mkSmallInteger(pos);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   735
	RETURN ( nil );
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   736
    }
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   737
%}
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   738
.
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   739
    ^ super skipSeparatorsExceptCR
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   740
!
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   741
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   742
skipThrough:anObject
6011
3b91d7834ca5 fixed: skipThrough dod not position atEnd if the element was not found.
Claus Gittinger <cg@exept.de>
parents: 5810
diff changeset
   743
    "skip all objects up-to and including anObject.
3b91d7834ca5 fixed: skipThrough dod not position atEnd if the element was not found.
Claus Gittinger <cg@exept.de>
parents: 5810
diff changeset
   744
     Return the receiver if skip was successful, 
3b91d7834ca5 fixed: skipThrough dod not position atEnd if the element was not found.
Claus Gittinger <cg@exept.de>
parents: 5810
diff changeset
   745
     otherwise (i.e. if not found) return nil and leave the stream positioned at the end.
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   746
     On success, the next read operation will return the element after anObject.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   747
     - reimplemented for speed on String-Streams for faster scanning"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   748
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   749
%{  /* NOCONTEXT */
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   750
    OBJ coll, p, l;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   751
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   752
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   753
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   754
    l = __INST(readLimit);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   755
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   756
    if (__isString(coll)
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   757
     && __isCharacter(anObject)
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   758
     && __bothSmallInteger(p, l)) {
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   759
	REGISTER unsigned char *chars;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   760
	REGISTER int pos, limit;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   761
	unsigned ch;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   762
	int sz;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   763
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   764
	pos = __intVal(p);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   765
	/* make 1-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   766
	pos = pos + 1 - __intVal( @global(PositionableStream:ZeroPosition));
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   767
	if (pos <= 0) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   768
	    RETURN ( nil );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   769
	}
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   770
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   771
	limit = __intVal(l);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   772
	sz = __stringSize(coll);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   773
	if (limit > sz) limit = sz;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   774
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   775
	chars = (unsigned char *)(__stringVal(coll) + pos - 1);
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   776
	ch = __intVal(_characterVal(anObject)) & 0xFF;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   777
	while (pos < limit) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   778
	    if (*chars == ch) {
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   779
		ch = *++chars;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   780
		pos++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   781
		/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   782
		pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   783
		__INST(position) = __mkSmallInteger(pos);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   784
		RETURN ( self );
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   785
	    }
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   786
	    chars++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   787
	    pos++;
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   788
	}
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   789
	/* make ZeroPosition-based */
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   790
	pos = pos - 1 + __intVal( @global(PositionableStream:ZeroPosition));
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   791
	__INST(position) = __mkSmallInteger(pos+1);
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   792
	RETURN ( nil );
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   793
    }
6011
3b91d7834ca5 fixed: skipThrough dod not position atEnd if the element was not found.
Claus Gittinger <cg@exept.de>
parents: 5810
diff changeset
   794
%}.
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   795
    ^ super skipThrough:anObject
10597
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   796
!
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   797
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   798
upToEnd
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   799
    "answer the contents of the stream from the current position up to the end"
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   800
10598
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   801
    |start|
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   802
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   803
    start := position + 1 - ZeroPosition.
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   804
    (start > readLimit) ifTrue:[^ self pastEndRead].
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   805
    position := readLimit .
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   806
    ^ collection copyFrom:start to:readLimit.
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   807
    
10597
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   808
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   809
    "
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   810
        '1234567890' readStream upToEnd
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   811
        #(1 2 3 4 5 6 7 8 9 0) readStream upToEnd
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   812
        '1234567890' readStream next; upToEnd
10598
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   813
        '1234567890' readStream next; upToEnd; next
10597
2ce737e46648 Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 9458
diff changeset
   814
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   815
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   816
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   817
!ReadStream methodsFor:'writing'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   818
a27a279701f8 Initial revision
claus
parents:
diff changeset
   819
nextPut:anElement
10
claus
parents: 5
diff changeset
   820
    "catch write access to readstreams - report an error"
claus
parents: 5
diff changeset
   821
claus
parents: 5
diff changeset
   822
    self shouldNotImplement
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   823
! !
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   824
2162
7e1601f633b6 ff is a separator too (in #skipSeparators*)
Claus Gittinger <cg@exept.de>
parents: 1688
diff changeset
   825
!ReadStream class methodsFor:'documentation'!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 611
diff changeset
   826
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 611
diff changeset
   827
version
10598
75ba1ed5a12b Faster #upToEnd
Stefan Vogel <sv@exept.de>
parents: 10597
diff changeset
   828
    ^ '$Header: /cvs/stx/stx/libbasic/ReadStream.st,v 1.61 2007-06-05 15:57:48 stefan Exp $'
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 611
diff changeset
   829
! !