ReadStream.st
author Stefan Vogel <sv@exept.de>
Thu, 12 Mar 2015 18:10:39 +0100
changeset 17604 1e1d9d9f1d2e
parent 17597 a78c4a2bf366
child 17612 368b5e4da6c9
permissions -rw-r--r--
class: ReadStream added: #copyToEndInto:bufferSize: changed: #next:into:startingAt:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
     1
"{ Encoding: utf8 }"
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
     2
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     3
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     4
 COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
     5
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    12
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    13
"
5810
3de0efaab65c checkin from browser
frank
parents: 5310
diff changeset
    14
"{ Package: 'stx:libbasic' }"
3de0efaab65c checkin from browser
frank
parents: 5310
diff changeset
    15
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    16
"{ NameSpace: Smalltalk }"
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    17
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    18
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
    19
	instanceVariableNames:''
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    20
	classVariableNames:''
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    21
	poolDictionaries:''
3b59c9b38dbb ST80 compatibility: generate signal at end of stream when instance variable
Stefan Vogel <sv@exept.de>
parents: 829
diff changeset
    22
	category:'Streams'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    23
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    24
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    25
!ReadStream primitiveDefinitions!
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    26
%{
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    27
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    28
#include <stdio.h>
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    29
#define _STDIO_H_INCLUDED_
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    30
#include <stdlib.h>
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    31
#include <string.h>
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    32
#include <memory.h>
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    33
#ifdef __osx__
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    34
// missing definition ?
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    35
extern void *memchr( void *, int, size_t);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    36
#endif
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    37
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    38
%}
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    39
! !
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
    40
2162
7e1601f633b6 ff is a separator too (in #skipSeparators*)
Claus Gittinger <cg@exept.de>
parents: 1688
diff changeset
    41
!ReadStream class methodsFor:'documentation'!
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    42
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    43
copyright
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    44
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    45
 COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    46
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    47
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    48
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    49
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    50
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    51
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    52
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    53
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    54
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    55
!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    56
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    57
documentation
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    58
"
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
    59
    ReadStream defines protocol for reading streamwise over collections.
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1138
diff changeset
    60
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1138
diff changeset
    61
    [author:]
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
    62
	Claus Gittinger
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1138
diff changeset
    63
88
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    64
"
81dacba7a63a *** empty log message ***
claus
parents: 59
diff changeset
    65
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    66
9305
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    67
!ReadStream class methodsFor:'blocked instance creation'!
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    68
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    69
with:aCollection
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
    70
    "with on readStream makes no sense
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    71
     - 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
    72
    <resource:#obsolete>
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    73
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
    74
    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
    75
    ^ super with:aCollection
6836bc44f3c3 warn when ReadStream with: is used.
Claus Gittinger <cg@exept.de>
parents: 8987
diff changeset
    76
! !
8987
b0d7be646112 #nextBytes:into:startingAt: now works, when fetching into a bit array.
Stefan Vogel <sv@exept.de>
parents: 8914
diff changeset
    77
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    78
!ReadStream methodsFor:'Compatibility-Squeak'!
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    79
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    80
next: n into: aCollection startingAt: startIndex
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    81
    "Read n objects into the given collection.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    82
    Return aCollection or a partial copy if less than
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    83
    n elements have been read."
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    84
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    85
    | max |
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    86
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    87
    collection notNil ifTrue:[
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    88
        max := (readLimit - position) min: n.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    89
        aCollection
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    90
            replaceFrom: startIndex
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    91
            to: startIndex+max-1
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    92
            with: collection
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    93
            startingAt: position+1.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    94
        position := position + max.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    95
        max = n
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    96
            ifTrue:[^ aCollection]
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    97
            ifFalse:[^ aCollection copyFrom: 1 to: startIndex+max-1].
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    98
    ].
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
    99
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   100
    ^ super next:n into:aCollection startingAt:startIndex.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   101
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   102
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   103
    "Modified: / 12-09-2010 / 13:06:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   104
! !
15840
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   105
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   106
!ReadStream methodsFor:'converting'!
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   107
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   108
readStream
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   109
    "return a readStream from the receiver. Since this is already
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   110
     a readStream, return self."
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   111
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   112
    ^ self
8140
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   113
!
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   114
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   115
readStreamOrNil
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   116
    "return a readStream from the receiver. Since this is already
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   117
     a readStream, return self.
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   118
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   119
     This method has been defined for protocol copmatibility with Filename"
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   120
7cc7ac5f29ca Define #xxxStreamOrNil methods.
Stefan Vogel <sv@exept.de>
parents: 8098
diff changeset
   121
    ^ self
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   122
! !
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   123
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   124
!ReadStream methodsFor:'emphasis'!
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   125
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   126
emphasis
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   127
    "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
   128
     element. Streams on a string will return nil for all elements.
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   129
     Streams on collections which nothing at all about emphasises,
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   130
     will report an error."
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   131
15351
be2b7a7ca2ca class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15262
diff changeset
   132
    ^ collection emphasisAt:(position + 1).
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   133
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   134
    "
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   135
     |t s|
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   136
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   137
     t := 'hello world' asText
16862
ca
parents: 16861
diff changeset
   138
		emphasizeFrom:1 to:5 with:#bold;
ca
parents: 16861
diff changeset
   139
		emphasizeFrom:7 to:11 with:#italic.
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   140
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   141
     s := t readStream.
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   142
     [s atEnd] whileFalse:[
16862
ca
parents: 16861
diff changeset
   143
	Transcript show:(s emphasis); show:' '.
ca
parents: 16861
diff changeset
   144
	Transcript show:''''; show:(s next); showCR:''''.
1400
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   145
     ].
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   146
    "
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   147
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   148
    "Modified: 15.5.1996 / 17:30:33 / cg"
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   149
! !
0ee12d945849 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   150
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   151
!ReadStream methodsFor:'misc functions'!
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   152
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   153
copyToEndInto:aWriteStream bufferSize:bufferSize
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   154
    "read from the receiver, and write all data up to the end to another stream.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   155
     Return the number of bytes which have been transferred.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   156
     Redefined here to avoid intermediate buffers/garbage.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   157
     bufferSize does not matter here."
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   158
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   159
    |cnt|
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   160
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   161
    collection notNil ifTrue:[
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   162
        aWriteStream nextPutAll:collection startingAt:position+1 to:readLimit.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   163
        cnt := readLimit - position.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   164
        position := readLimit.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   165
        ^ cnt.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   166
    ].
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   167
    ^ super copyToEndInto:aWriteStream bufferSize:bufferSize.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   168
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   169
    "
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   170
     |rs ws|
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   171
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   172
     ws := #() writeStream.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   173
     rs := #( 1 2 3 4 ) readStream.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   174
     rs next.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   175
     rs copyToEndInto:ws bufferSize:0.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   176
     ws contents.
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   177
    "
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   178
! !
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   179
345
claus
parents: 329
diff changeset
   180
!ReadStream methodsFor:'queries'!
claus
parents: 329
diff changeset
   181
15583
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   182
collectionSize
16862
ca
parents: 16861
diff changeset
   183
    "return the overall number of elements in the streamed collection
15583
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   184
     (both already read and to be read)."
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   185
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   186
    ^ collection size
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   187
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   188
    "Created: / 30-07-2013 / 20:55:51 / cg"
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   189
!
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   190
5310
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   191
copyFrom:beginning to:end
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   192
    ^ collection copyFrom:beginning to:end
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   193
!
b943d0eae029 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4826
diff changeset
   194
345
claus
parents: 329
diff changeset
   195
isReadable
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   196
    "return true, if reading is supported by the recevier.
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   197
     Here, true is always returned."
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   198
345
claus
parents: 329
diff changeset
   199
    ^ true
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   200
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   201
    "Modified: 4.10.1997 / 17:59:21 / cg"
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   202
!
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   203
6315
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   204
isWritable
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   205
    "return true, if writing is supported by the recevier.
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   206
     This has to be redefined in concrete subclasses."
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   207
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   208
    ^ false
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   209
!
11b585e578f5 Define #isWritable
Stefan Vogel <sv@exept.de>
parents: 6011
diff changeset
   210
15582
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   211
remainingSize
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   212
    "return the number of remaining elements in the streamed collection."
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   213
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   214
    ^ collection size - position
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   215
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   216
    "Created: / 30-07-2013 / 20:18:12 / cg"
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   217
!
11a8428d9a10 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15356
diff changeset
   218
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   219
size
14936
05740c019161 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 13717
diff changeset
   220
    "return the number of remaining elements in the streamed collection."
2997
5254aeab421d comments
Claus Gittinger <cg@exept.de>
parents: 2446
diff changeset
   221
15583
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   222
    "/ will change back soon for VW and Squeak compatibility.
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   223
    "/ ^ self collectionSize.
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   224
    ^  self remainingSize
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   225
891cdc8bd093 class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15582
diff changeset
   226
    "Modified (comment): / 30-07-2013 / 20:57:23 / cg"
345
claus
parents: 329
diff changeset
   227
! !
claus
parents: 329
diff changeset
   228
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   229
!ReadStream methodsFor:'reading'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   230
a27a279701f8 Initial revision
claus
parents:
diff changeset
   231
next
a27a279701f8 Initial revision
claus
parents:
diff changeset
   232
    "return the next element; advance read pointer.
2
claus
parents: 1
diff changeset
   233
     return nil, if there is no next element.
345
claus
parents: 329
diff changeset
   234
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   235
a27a279701f8 Initial revision
claus
parents:
diff changeset
   236
    |ret|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   237
a27a279701f8 Initial revision
claus
parents:
diff changeset
   238
%{  /* NOCONTEXT */
a27a279701f8 Initial revision
claus
parents:
diff changeset
   239
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   240
    REGISTER INT pos;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   241
    unsigned ch;
252
   242
    OBJ coll, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   243
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   244
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   245
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   246
    l = __INST(readLimit);
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   247
252
   248
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
   249
16862
ca
parents: 16861
diff changeset
   250
	pos = __intVal(p);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   251
	if (pos >= 0 && pos < __intVal(l)) {
16862
ca
parents: 16861
diff changeset
   252
	    OBJ cls, ret;
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   253
16862
ca
parents: 16861
diff changeset
   254
	    cls = __qClass(coll);
ca
parents: 16861
diff changeset
   255
	    if (cls == @global(String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   256
		if (pos < __stringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   257
		    ch = __stringVal(coll)[pos];
16862
ca
parents: 16861
diff changeset
   258
		    ret = __MKCHARACTER(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   259
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   260
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   261
		}
ca
parents: 16861
diff changeset
   262
	    } else if (cls == @global(ByteArray)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   263
		if (pos < __byteArraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   264
		    ch = __ByteArrayInstPtr(coll)->ba_element[pos];
16862
ca
parents: 16861
diff changeset
   265
		    ret = __mkSmallInteger(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   266
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   267
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   268
		}
ca
parents: 16861
diff changeset
   269
	    } else if (cls == @global(Unicode16String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   270
		if (pos < __unicode16StringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   271
		    ch = __Unicode16StringInstPtr(coll)->s_element[pos];
16862
ca
parents: 16861
diff changeset
   272
		    ret = __MKUCHARACTER(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   273
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   274
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   275
		}
ca
parents: 16861
diff changeset
   276
	    } else if (cls == @global(Array)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   277
		if (pos < __arraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   278
		    ret = __ArrayInstPtr(coll)->a_element[pos];
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   279
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   280
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   281
		}
ca
parents: 16861
diff changeset
   282
	    }
ca
parents: 16861
diff changeset
   283
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   284
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   285
%}.
15356
854a02a2bebc class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15351
diff changeset
   286
    (position >= readLimit) ifTrue:[^ self pastEndRead].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   287
    position := position + 1.
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   288
    ret := collection at:position.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   289
    ^ ret
a27a279701f8 Initial revision
claus
parents:
diff changeset
   290
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   291
12176
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   292
next:count
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   293
    "return the next count elements of the stream as aCollection,
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   294
     which depends on the streams type - (see #contentsSpecies)."
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   295
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   296
    |answer|
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   297
16198
b435afd3f29d class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15840
diff changeset
   298
    self contentsSpecies == collection class ifTrue:[
16862
ca
parents: 16861
diff changeset
   299
	((position + count) > readLimit) ifFalse:[
ca
parents: 16861
diff changeset
   300
	    answer := collection copyFrom:position+1 to:position+count.
ca
parents: 16861
diff changeset
   301
	    position := position+count.
ca
parents: 16861
diff changeset
   302
	    ^ answer
ca
parents: 16861
diff changeset
   303
	].
12176
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   304
    ].
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   305
    ^ super next:count
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   306
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   307
    "
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   308
     #[1 2 3 4 5 6 7 8 9] readStream
16862
ca
parents: 16861
diff changeset
   309
	next;
ca
parents: 16861
diff changeset
   310
	next:5;
ca
parents: 16861
diff changeset
   311
	next.
12176
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   312
    "
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   313
!
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   314
252
   315
nextAlphaNumericWord
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   316
    "read the next word (i.e. up to non letter-or-digit).
a27a279701f8 Initial revision
claus
parents:
diff changeset
   317
     return a string containing those characters.
3112
ccf7121ddae8 nextAlphaNumericWord changed
Claus Gittinger <cg@exept.de>
parents: 2997
diff changeset
   318
     Skips any non-alphanumeric chars first.
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   319
     - tuned for speed on String-Streams for faster scanning"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   320
%{
a27a279701f8 Initial revision
claus
parents:
diff changeset
   321
    /* speedup, if collection is a string */
a27a279701f8 Initial revision
claus
parents:
diff changeset
   322
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   323
    INT pos, limit, sz;
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   324
    INT len;
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   325
    char quickBuffer[256];
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   326
    char *buffer = quickBuffer;
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   327
    int bufferSize = sizeof(quickBuffer);
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   328
    REGISTER unsigned char *cp;
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   329
    REGISTER unsigned ch;
252
   330
    OBJ coll, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   331
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   332
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   333
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   334
    l = __INST(readLimit);
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   335
12479
62b11c1f462e change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 12176
diff changeset
   336
    if (__isStringLike(coll) && __bothSmallInteger(p, l)) {
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   337
	OBJ retVal;
252
   338
16862
ca
parents: 16861
diff changeset
   339
	pos = __intVal(p);
ca
parents: 16861
diff changeset
   340
	/* make 1-based */
ca
parents: 16861
diff changeset
   341
	pos = pos + 1;
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   342
16862
ca
parents: 16861
diff changeset
   343
	limit = __intVal(l);
ca
parents: 16861
diff changeset
   344
	sz = __qSize(coll) - OHDR_SIZE;
ca
parents: 16861
diff changeset
   345
	if (sz < limit)
ca
parents: 16861
diff changeset
   346
	    limit = sz;
ca
parents: 16861
diff changeset
   347
	cp = __stringVal(coll) + pos - 1;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   348
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   349
	/* skip over non-alphanumeric characters */
16862
ca
parents: 16861
diff changeset
   350
	for (;;) {
ca
parents: 16861
diff changeset
   351
	    if (pos > limit) break;
ca
parents: 16861
diff changeset
   352
	    ch = *cp;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   353
16862
ca
parents: 16861
diff changeset
   354
	    if (((ch >= 'a') && (ch <= 'z')) ||
ca
parents: 16861
diff changeset
   355
		((ch >= 'A') && (ch <= 'Z')) ||
ca
parents: 16861
diff changeset
   356
		((ch >= '0') && (ch <= '9')))
ca
parents: 16861
diff changeset
   357
		break;
ca
parents: 16861
diff changeset
   358
	    cp++;
ca
parents: 16861
diff changeset
   359
	    pos++;
ca
parents: 16861
diff changeset
   360
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   361
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   362
	/* collect non-alphanumeric characters */
16862
ca
parents: 16861
diff changeset
   363
	len = 0;
ca
parents: 16861
diff changeset
   364
	for (;;) {
ca
parents: 16861
diff changeset
   365
	    if (pos > limit) break;
ca
parents: 16861
diff changeset
   366
	    ch = *cp & 0xFF;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   367
16862
ca
parents: 16861
diff changeset
   368
	    if (! (((ch >= 'a') && (ch <= 'z')) ||
ca
parents: 16861
diff changeset
   369
		   ((ch >= 'A') && (ch <= 'Z')) ||
ca
parents: 16861
diff changeset
   370
		   ((ch >= '0') && (ch <= '9'))))
ca
parents: 16861
diff changeset
   371
		break;
ca
parents: 16861
diff changeset
   372
	    buffer[len++] = ch;
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   373
	    if (len >= (bufferSize-1)) {
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   374
		int newBufferSize = bufferSize * 2;
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   375
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   376
		if (buffer == quickBuffer) {
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   377
		    buffer = (char *)malloc(newBufferSize);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   378
		    memcpy(buffer, quickBuffer, bufferSize);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   379
		} else {
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   380
		    buffer = (char *)realloc(buffer, newBufferSize);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   381
		}
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   382
		bufferSize = newBufferSize;
16862
ca
parents: 16861
diff changeset
   383
	    }
ca
parents: 16861
diff changeset
   384
	    pos++;
ca
parents: 16861
diff changeset
   385
	    cp++;
ca
parents: 16861
diff changeset
   386
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   387
16862
ca
parents: 16861
diff changeset
   388
	pos = pos - 1;
ca
parents: 16861
diff changeset
   389
	__INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   390
	buffer[len] = '\0';
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   391
	if (len == 0) {
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   392
	    RETURN (nil);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   393
	}
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   394
	retVal = __MKSTRING_L(buffer, len);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   395
	if (buffer != quickBuffer) {
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   396
	    free((void *)buffer);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   397
	}
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   398
	RETURN ( retVal );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   399
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
   400
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
   401
.
252
   402
    ^ super nextAlphaNumericWord
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   403
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   404
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   405
nextByte
15840
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   406
    "return the next element as an integer between 0 and 255; advance read pointer.
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   407
     - 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
   408
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   409
    |ret|
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   410
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   411
%{  /* NOCONTEXT */
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   412
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   413
    REGISTER INT pos;
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   414
    unsigned ch;
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   415
    OBJ coll, p, l;
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   416
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   417
    coll = __INST(collection);
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   418
    p = __INST(position);
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   419
    l = __INST(readLimit);
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   420
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   421
    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
   422
16862
ca
parents: 16861
diff changeset
   423
	pos = __intVal(p);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   424
	if (pos >= 0 && pos < __intVal(l)) {
16862
ca
parents: 16861
diff changeset
   425
	    OBJ cls, ret;
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   426
16862
ca
parents: 16861
diff changeset
   427
	    cls = __qClass(coll);
ca
parents: 16861
diff changeset
   428
	    if (cls == @global(String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   429
		if (pos < __stringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   430
		    ch = __stringVal(coll)[pos];
16862
ca
parents: 16861
diff changeset
   431
		    ret = __mkSmallInteger(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   432
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   433
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   434
		}
ca
parents: 16861
diff changeset
   435
	    } else if (cls == @global(ByteArray)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   436
		if (pos < __byteArraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   437
		    ch = __ByteArrayInstPtr(coll)->ba_element[pos];
16862
ca
parents: 16861
diff changeset
   438
		    ret = __mkSmallInteger(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   439
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   440
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   441
		}
ca
parents: 16861
diff changeset
   442
	    } else if (cls == @global(Array)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   443
		if (pos < __arraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   444
		    ret = __ArrayInstPtr(coll)->a_element[pos];
16862
ca
parents: 16861
diff changeset
   445
		    if (!__isSmallInteger(ret) || __intVal(ret) > 255) goto out;
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   446
		    __INST(position) = __mkSmallInteger(pos+1);
16862
ca
parents: 16861
diff changeset
   447
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   448
		}
ca
parents: 16861
diff changeset
   449
	    }
ca
parents: 16861
diff changeset
   450
	}
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   451
    }
15840
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   452
out:;
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   453
%}.
15356
854a02a2bebc class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15351
diff changeset
   454
    (position >= readLimit) ifTrue:[^ self pastEndRead].
15840
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   455
    ret := (collection at:(position + 1)) asInteger.
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   456
    ret > 255 ifTrue:[
16862
ca
parents: 16861
diff changeset
   457
	ret := ConversionError
ca
parents: 16861
diff changeset
   458
	    raiseRequestWith:self
ca
parents: 16861
diff changeset
   459
	    errorString:' - #nextByte trying to read a non-byte'.
15840
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   460
    ].
4826
ff30434f0feb #nextByte does return an integer, even when operating on a
Claus Gittinger <cg@exept.de>
parents: 4522
diff changeset
   461
    position := position + 1.
15840
597e55c78e43 class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 15638
diff changeset
   462
    ^ ret
1665
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   463
!
928e9a308cea added ExternalStream compatibility protocol
Claus Gittinger <cg@exept.de>
parents: 1488
diff changeset
   464
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   465
nextBytes:numBytes into:aCollection startingAt:initialIndex
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   466
    "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
   467
     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
   468
     collection.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   469
     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
   470
     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
   471
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   472
     Notice: this method is provided here for protocol completeness
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   473
	     with externalStreams - it is normally not used with other
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   474
	     streams."
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   475
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   476
    ((initialIndex + numBytes - 1) <= aCollection size
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   477
	and:[(position + numBytes) <= readLimit
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   478
	and:[collection isByteCollection
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   479
	and:[aCollection isByteCollection
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   480
    ]]]) ifTrue:[
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   481
	"do it the fast way"
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   482
	aCollection
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   483
	    replaceBytesFrom:initialIndex to:(initialIndex + numBytes - 1)
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   484
	    with:collection startingAt:position+1.
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   485
	position := position + numBytes.
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   486
	^ numBytes
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   487
    ].
9458
ea81e322a954 off-by-one error in #nextBytes:into:startingAt:
Stefan Vogel <sv@exept.de>
parents: 9457
diff changeset
   488
    "do it the hard way"
8530
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   489
    ^ 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
   490
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   491
    "
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   492
     |s n buffer|
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   493
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   494
     buffer := ByteArray new:10.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   495
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   496
     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
   497
     s next:3.
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   498
     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
   499
     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
   500
    "
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   501
!
edcadeea17a1 tuned reading long strings & byteArrays from byteArray streams.
Claus Gittinger <cg@exept.de>
parents: 8140
diff changeset
   502
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   503
nextDecimalInteger
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   504
    "read the next integer in radix 10.
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   505
     Does NOT skip initial whitespace.
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   506
     The streams elements should be characters.
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   507
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   508
     Be careful - this method returns 0 if not positioned on a digit intitially
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   509
     or if the end of the stream is encountered.
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   510
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   511
     Tuned for speed on String-Streams for faster scanning"
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   512
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   513
    |value nextOne|
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   514
%{
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   515
    INT pos, limit, sz;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   516
    REGISTER unsigned char *cp;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   517
    REGISTER unsigned ch;
8914
Claus Gittinger <cg@exept.de>
parents: 8913
diff changeset
   518
    INT val = 0;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   519
    OBJ coll, p, l;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   520
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   521
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   522
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   523
    l = __INST(readLimit);
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   524
12479
62b11c1f462e change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 12176
diff changeset
   525
    if (__isStringLike(coll) && __bothSmallInteger(p, l)) {
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   526
16862
ca
parents: 16861
diff changeset
   527
	pos = __intVal(p);
ca
parents: 16861
diff changeset
   528
	/* make 1-based */
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   529
	pos++;
16862
ca
parents: 16861
diff changeset
   530
	limit = __intVal(l);
ca
parents: 16861
diff changeset
   531
	sz = __qSize(coll) - OHDR_SIZE;
ca
parents: 16861
diff changeset
   532
	if (sz < limit)
ca
parents: 16861
diff changeset
   533
	    limit = sz;
ca
parents: 16861
diff changeset
   534
	cp = __stringVal(coll) + pos - 1;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   535
16862
ca
parents: 16861
diff changeset
   536
	for (;;) {
ca
parents: 16861
diff changeset
   537
	    if (pos > limit) break;
ca
parents: 16861
diff changeset
   538
	    ch = *cp;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   539
16862
ca
parents: 16861
diff changeset
   540
	    if ((ch < '0') || (ch > '9')) break;
ca
parents: 16861
diff changeset
   541
	    val = val * 10 + (ch - '0');
ca
parents: 16861
diff changeset
   542
	    pos++;
ca
parents: 16861
diff changeset
   543
	    if (val > (_MAX_INT / 10)) goto oops;
ca
parents: 16861
diff changeset
   544
	    cp++;
ca
parents: 16861
diff changeset
   545
	}
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   546
	pos--;
16862
ca
parents: 16861
diff changeset
   547
	__INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   548
	RETURN (__mkSmallInteger(val));
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   549
    }
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   550
oops:
8913
b9498d27a554 64bit; mkSmallInteger
Claus Gittinger <cg@exept.de>
parents: 8614
diff changeset
   551
    value = __mkSmallInteger(val);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   552
%}
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   553
.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   554
    "fall-back for non-string streams - we have to continue where
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   555
     above primitive left off, in case of a large integer ...
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   556
     (instead of doing a super nextDecimalInteger)"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   557
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   558
    nextOne := self peek.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   559
    [nextOne notNil and:[nextOne isDigitRadix:10]] whileTrue:[
16862
ca
parents: 16861
diff changeset
   560
	value := (value * 10) + nextOne digitValue.
ca
parents: 16861
diff changeset
   561
	nextOne := self nextPeek
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   562
    ].
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   563
    ^ value
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   564
!
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   565
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   566
nextOrNil
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   567
    "return the next element; advance read pointer.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   568
     return nil, if there is no next element.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   569
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   570
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   571
    |ret|
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   572
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   573
%{  /* NOCONTEXT */
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   574
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   575
    REGISTER INT pos;
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   576
    unsigned ch;
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   577
    OBJ coll, p, l;
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   578
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   579
    coll = __INST(collection);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   580
    p = __INST(position);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   581
    l = __INST(readLimit);
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   582
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   583
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
16862
ca
parents: 16861
diff changeset
   584
	pos = __intVal(p);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   585
	if (pos >= 0) {
16862
ca
parents: 16861
diff changeset
   586
	    OBJ cls, ret;
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   587
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   588
	    if (pos >= __intVal(l)) {
16862
ca
parents: 16861
diff changeset
   589
		RETURN(nil);
ca
parents: 16861
diff changeset
   590
	    }
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   591
16862
ca
parents: 16861
diff changeset
   592
	    cls = __qClass(coll);
ca
parents: 16861
diff changeset
   593
	    if (cls == @global(String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   594
		if (pos < __stringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   595
		    ch = __stringVal(coll)[pos];
16862
ca
parents: 16861
diff changeset
   596
		    ret = __MKCHARACTER(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   597
		    __INST(position) = __mkSmallInteger(pos + 1);
16862
ca
parents: 16861
diff changeset
   598
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   599
		}
ca
parents: 16861
diff changeset
   600
	    } else if (cls == @global(ByteArray)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   601
		if (pos < __byteArraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   602
		    ch = __ByteArrayInstPtr(coll)->ba_element[pos];
16862
ca
parents: 16861
diff changeset
   603
		    ret = __mkSmallInteger(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   604
		    __INST(position) = __mkSmallInteger(pos + 1);
16862
ca
parents: 16861
diff changeset
   605
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   606
		}
ca
parents: 16861
diff changeset
   607
	    } else if (cls == @global(Unicode16String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   608
		if (pos < __unicode16StringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   609
		    ch = __Unicode16StringInstPtr(coll)->s_element[pos];
16862
ca
parents: 16861
diff changeset
   610
		    ret = __MKUCHARACTER(ch);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   611
		    __INST(position) = __mkSmallInteger(pos + 1);
16862
ca
parents: 16861
diff changeset
   612
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   613
		}
ca
parents: 16861
diff changeset
   614
	    } else if (cls == @global(Array)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   615
		if (pos < __arraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   616
		    ret = __ArrayInstPtr(coll)->a_element[pos];
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   617
		    __INST(position) = __mkSmallInteger(pos + 1);
16862
ca
parents: 16861
diff changeset
   618
		    RETURN ( ret );
ca
parents: 16861
diff changeset
   619
		}
ca
parents: 16861
diff changeset
   620
	    }
ca
parents: 16861
diff changeset
   621
	}
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   622
    }
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   623
%}.
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   624
    position := position + 1.
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   625
    ret := collection at:position.
9457
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   626
    ^ ret
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   627
!
71a5c4520fba +nextOrNil
Claus Gittinger <cg@exept.de>
parents: 9351
diff changeset
   628
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   629
nextPeek
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   630
    "advance read pointer return the peek element.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   631
     this is equivalent to (self next; peek).
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   632
     - tuned for speed on String-Streams for faster scanning"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   633
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   634
%{  /* NOCONTEXT */
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   635
    OBJ coll, l, p;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   636
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   637
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   638
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   639
    l = __INST(readLimit);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   640
12479
62b11c1f462e change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 12176
diff changeset
   641
    if (__isStringLike(coll) && __bothSmallInteger(p, l)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   642
	REGISTER INT pos;
16862
ca
parents: 16861
diff changeset
   643
	unsigned ch;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   644
16862
ca
parents: 16861
diff changeset
   645
	pos = __intVal(p);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   646
	pos++;
16862
ca
parents: 16861
diff changeset
   647
	if ((pos > 0) && (pos < __intVal(l)) && (pos < __stringSize(coll))) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   648
	    ch = __stringVal(coll)[pos];
16862
ca
parents: 16861
diff changeset
   649
	    __INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   650
	    RETURN ( __MKCHARACTER(ch) );
ca
parents: 16861
diff changeset
   651
	}
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   652
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   653
%}.
15356
854a02a2bebc class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15351
diff changeset
   654
    (position >= readLimit) ifTrue:[^ self pastEndRead].
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   655
    position := position + 1.
15356
854a02a2bebc class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15351
diff changeset
   656
    (position >= readLimit) ifTrue:[^ self pastEndRead].
15351
be2b7a7ca2ca class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15262
diff changeset
   657
    ^ collection at:(position + 1)
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   658
!
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   659
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   660
peek
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   661
    "return the next element; do NOT advance read pointer.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   662
     return nil, if there is no next element.
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   663
     - tuned for a bit more speed on String/ByteArray/Array-Streams"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   664
a27a279701f8 Initial revision
claus
parents:
diff changeset
   665
%{  /* NOCONTEXT */
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   666
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   667
    REGISTER INT pos;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   668
    unsigned ch;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   669
    OBJ coll;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   670
    OBJ cls, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   671
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   672
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   673
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   674
    l = __INST(readLimit);
252
   675
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   676
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   677
16862
ca
parents: 16861
diff changeset
   678
	pos = __intVal(p);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   679
	if ((pos < __intVal(l)) && (pos >= 0)) {
16862
ca
parents: 16861
diff changeset
   680
	    cls = __qClass(coll);
ca
parents: 16861
diff changeset
   681
	    if (cls == @global(String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   682
		if (pos < __stringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   683
		    ch = __stringVal(coll)[pos];
16862
ca
parents: 16861
diff changeset
   684
		    RETURN ( __MKCHARACTER(ch) );
ca
parents: 16861
diff changeset
   685
		}
ca
parents: 16861
diff changeset
   686
	    } else if (cls == @global(ByteArray)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   687
		if (pos < __byteArraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   688
		    ch = __ByteArrayInstPtr(coll)->ba_element[pos];
16862
ca
parents: 16861
diff changeset
   689
		    RETURN ( __mkSmallInteger(ch) );
ca
parents: 16861
diff changeset
   690
		}
ca
parents: 16861
diff changeset
   691
	    } else if (cls == @global(Array)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   692
		if (pos < __arraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   693
		    RETURN ( __ArrayInstPtr(coll)->a_element[pos]);
16862
ca
parents: 16861
diff changeset
   694
		}
ca
parents: 16861
diff changeset
   695
	    }
ca
parents: 16861
diff changeset
   696
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   697
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   698
%}.
15356
854a02a2bebc class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15351
diff changeset
   699
    (position >= readLimit) ifTrue:[^ self pastEndRead].
15351
be2b7a7ca2ca class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15262
diff changeset
   700
    ^ collection at:(position + 1)
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   701
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   702
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   703
peekOrNil
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   704
    "return the next element; do NOT advance read pointer.
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   705
     return nil, if there is no next element.
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   706
     This is much like #peek -
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   707
     However, unlike #peek, this does not raise an atEnd-query signal - even
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   708
     if handled. Instead, nil is returned immediately."
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   709
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   710
%{  /* NOCONTEXT */
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   711
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   712
    REGISTER INT pos;
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   713
    unsigned ch;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   714
    OBJ coll;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   715
    OBJ cls, p, l;
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   716
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   717
    coll = __INST(collection);
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   718
    p = __INST(position);
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   719
    l = __INST(readLimit);
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   720
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   721
    if (__isNonNilObject(coll) && __bothSmallInteger(p, l)) {
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   722
16862
ca
parents: 16861
diff changeset
   723
	pos = __intVal(p);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   724
	if ((pos < __intVal(l)) && (pos >= 0)) {
16862
ca
parents: 16861
diff changeset
   725
	    cls = __qClass(coll);
ca
parents: 16861
diff changeset
   726
	    if (cls == @global(String)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   727
		if (pos < __stringSize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   728
		    ch = __stringVal(coll)[pos];
16862
ca
parents: 16861
diff changeset
   729
		    RETURN ( __MKCHARACTER(ch) );
ca
parents: 16861
diff changeset
   730
		}
ca
parents: 16861
diff changeset
   731
		RETURN ( nil );
ca
parents: 16861
diff changeset
   732
	    } else if (cls == @global(ByteArray)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   733
		if (pos < __byteArraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   734
		    ch = __ByteArrayInstPtr(coll)->ba_element[pos];
16862
ca
parents: 16861
diff changeset
   735
		    RETURN ( __mkSmallInteger(ch) );
ca
parents: 16861
diff changeset
   736
		}
ca
parents: 16861
diff changeset
   737
		RETURN ( nil );
ca
parents: 16861
diff changeset
   738
	    } else if (cls == @global(Array)) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   739
		if (pos < __arraySize(coll)) {
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   740
		    RETURN ( __ArrayInstPtr(coll)->a_element[pos]);
16862
ca
parents: 16861
diff changeset
   741
		}
ca
parents: 16861
diff changeset
   742
		RETURN ( nil );
ca
parents: 16861
diff changeset
   743
	    }
ca
parents: 16861
diff changeset
   744
	}
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   745
    }
7051
984d8271d06b preps for 0-based stream positions
Claus Gittinger <cg@exept.de>
parents: 6814
diff changeset
   746
%}.
15356
854a02a2bebc class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15351
diff changeset
   747
    (position >= readLimit) ifTrue:[^ nil].
15351
be2b7a7ca2ca class: ReadStream
Claus Gittinger <cg@exept.de>
parents: 15262
diff changeset
   748
    ^ collection at:(position + 1)
3316
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   749
!
ba0a4305f900 added #peekOrNil
Claus Gittinger <cg@exept.de>
parents: 3112
diff changeset
   750
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   751
skipSeparators
a27a279701f8 Initial revision
claus
parents:
diff changeset
   752
    "skip all whitespace; next will return next non-white-space element.
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   753
     Return the peeked character or nil, if the end-of-stream was reached.
2
claus
parents: 1
diff changeset
   754
     - reimplemented for speed on String-Streams for faster scanning"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   755
a27a279701f8 Initial revision
claus
parents:
diff changeset
   756
%{  /* NOCONTEXT */
252
   757
    OBJ coll, p, l;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   758
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   759
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   760
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   761
    l = __INST(readLimit);
252
   762
12479
62b11c1f462e change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 12176
diff changeset
   763
    if (__isStringLike(coll) && __bothSmallInteger(p, l)) {
16862
ca
parents: 16861
diff changeset
   764
	REGISTER unsigned char *chars;
ca
parents: 16861
diff changeset
   765
	REGISTER unsigned ch;
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   766
	REGISTER INT pos;
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   767
	INT limit;
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   768
	INT sz;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   769
16862
ca
parents: 16861
diff changeset
   770
	pos = __intVal(p);
ca
parents: 16861
diff changeset
   771
	/* make 1-based */
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   772
	pos++;
16862
ca
parents: 16861
diff changeset
   773
	if (pos <= 0) {
ca
parents: 16861
diff changeset
   774
	    RETURN ( nil );
ca
parents: 16861
diff changeset
   775
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   776
16862
ca
parents: 16861
diff changeset
   777
	limit = __intVal(l);
ca
parents: 16861
diff changeset
   778
	sz = __qSize(coll) - OHDR_SIZE;
ca
parents: 16861
diff changeset
   779
	if (limit > sz) {
ca
parents: 16861
diff changeset
   780
	    limit = sz;
ca
parents: 16861
diff changeset
   781
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   782
16862
ca
parents: 16861
diff changeset
   783
	chars = (unsigned char *)(__stringVal(coll) + pos - 1);
ca
parents: 16861
diff changeset
   784
	while (pos <= limit) {
ca
parents: 16861
diff changeset
   785
	    ch = *chars++;
ca
parents: 16861
diff changeset
   786
	    if ((ch > 0x20)
ca
parents: 16861
diff changeset
   787
	     || ((ch != ' ')
ca
parents: 16861
diff changeset
   788
		 && (ch != '\t')
ca
parents: 16861
diff changeset
   789
		 && (ch != '\r')
ca
parents: 16861
diff changeset
   790
		 && (ch != '\n')
ca
parents: 16861
diff changeset
   791
		 && (ch != '\f')
ca
parents: 16861
diff changeset
   792
		 && (ch != 0x0B))) {
ca
parents: 16861
diff changeset
   793
		__INST(position) = __mkSmallInteger(pos-1);
ca
parents: 16861
diff changeset
   794
		RETURN ( __MKCHARACTER(ch) );
ca
parents: 16861
diff changeset
   795
	    }
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   796
	    pos++;
16862
ca
parents: 16861
diff changeset
   797
	}
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   798
	pos--;
16862
ca
parents: 16861
diff changeset
   799
	__INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   800
	RETURN ( nil );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   801
    }
1406
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   802
%}.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   803
    ^ super skipSeparators
1406
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   804
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   805
    "
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   806
     |s|
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   807
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   808
     s := '     hello     world    ' readStream.
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   809
     s skipSeparators.
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   810
     s next.
fd7eed0e648f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1400
diff changeset
   811
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   812
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   813
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   814
skipSeparatorsExceptCR
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   815
    "skip all whitespace except newlines;
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   816
     next will return next non-white-space element.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   817
     - reimplemented for speed on String-Streams for faster scanning"
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   818
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   819
%{  /* NOCONTEXT */
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   820
252
   821
    OBJ coll, p, l;
   822
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   823
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   824
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   825
    l = __INST(readLimit);
252
   826
12479
62b11c1f462e change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 12176
diff changeset
   827
    if (__isStringLike(coll) && __bothSmallInteger(p, l)) {
16862
ca
parents: 16861
diff changeset
   828
	REGISTER unsigned char *chars;
ca
parents: 16861
diff changeset
   829
	REGISTER unsigned ch;
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   830
	REGISTER INT pos;
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   831
	INT limit;
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   832
	INT sz;
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   833
16862
ca
parents: 16861
diff changeset
   834
	pos = __intVal(p);
ca
parents: 16861
diff changeset
   835
	/* make 1-based */
ca
parents: 16861
diff changeset
   836
	pos = pos + 1;
ca
parents: 16861
diff changeset
   837
	if (pos <= 0) {
ca
parents: 16861
diff changeset
   838
	    RETURN ( nil );
ca
parents: 16861
diff changeset
   839
	}
2162
7e1601f633b6 ff is a separator too (in #skipSeparators*)
Claus Gittinger <cg@exept.de>
parents: 1688
diff changeset
   840
16862
ca
parents: 16861
diff changeset
   841
	limit = __intVal(l);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   842
	sz = __qSize(coll) - OHDR_SIZE;
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   843
	if (limit > sz)
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   844
	    limit = sz;
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   845
16862
ca
parents: 16861
diff changeset
   846
	chars = (unsigned char *)(__stringVal(coll) + pos - 1);
ca
parents: 16861
diff changeset
   847
	while (pos <= limit) {
ca
parents: 16861
diff changeset
   848
	    ch = *chars++;
ca
parents: 16861
diff changeset
   849
	    if (((int)ch > 0x20)
ca
parents: 16861
diff changeset
   850
	     || (
ca
parents: 16861
diff changeset
   851
		 (ch != ' ')
ca
parents: 16861
diff changeset
   852
		 && (ch != '\t')
ca
parents: 16861
diff changeset
   853
		 && (ch != '\f')
ca
parents: 16861
diff changeset
   854
		 && (ch != '\b')
ca
parents: 16861
diff changeset
   855
		 && (ch != 0x0B))) {
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   856
		pos--;
16862
ca
parents: 16861
diff changeset
   857
		__INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   858
		RETURN ( __MKCHARACTER(ch) );
ca
parents: 16861
diff changeset
   859
	    }
ca
parents: 16861
diff changeset
   860
	    pos++;
ca
parents: 16861
diff changeset
   861
	}
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   862
	pos--;
16862
ca
parents: 16861
diff changeset
   863
	__INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   864
	RETURN ( nil );
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   865
    }
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   866
%}
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   867
.
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   868
    ^ super skipSeparatorsExceptCR
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   869
!
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   870
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   871
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
   872
    "skip all objects up-to and including anObject.
15262
5047292c9107 all stx macros begin with double underline (eg. __qClass instead of _qClass)
Claus Gittinger <cg@exept.de>
parents: 14936
diff changeset
   873
     Return the receiver if skip was successful,
6011
3b91d7834ca5 fixed: skipThrough dod not position atEnd if the element was not found.
Claus Gittinger <cg@exept.de>
parents: 5810
diff changeset
   874
     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
   875
     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
   876
     - reimplemented for speed on String-Streams for faster scanning"
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   877
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   878
%{  /* NOCONTEXT */
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   879
    OBJ coll, p, l;
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   880
1133
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   881
    coll = __INST(collection);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   882
    p = __INST(position);
961f2b095c22 underline cleanup
Claus Gittinger <cg@exept.de>
parents: 970
diff changeset
   883
    l = __INST(readLimit);
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   884
12479
62b11c1f462e change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 12176
diff changeset
   885
    if (__isStringLike(coll)
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   886
     && __isCharacter(anObject)
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   887
     && __bothSmallInteger(p, l)) {
16862
ca
parents: 16861
diff changeset
   888
	REGISTER unsigned char *chars;
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   889
	REGISTER INT pos, limit;
16862
ca
parents: 16861
diff changeset
   890
	unsigned ch;
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   891
	INT sz;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   892
16862
ca
parents: 16861
diff changeset
   893
	ch = __intVal(__characterVal(anObject));
ca
parents: 16861
diff changeset
   894
	if (ch <= 0xFF) {
ca
parents: 16861
diff changeset
   895
	    pos = __intVal(p);
ca
parents: 16861
diff changeset
   896
	    pos = pos + 1;
ca
parents: 16861
diff changeset
   897
	    if (pos <= 0) {
ca
parents: 16861
diff changeset
   898
		RETURN ( nil );
ca
parents: 16861
diff changeset
   899
	    }
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   900
16862
ca
parents: 16861
diff changeset
   901
	    limit = __intVal(l);
ca
parents: 16861
diff changeset
   902
	    sz = __stringSize(coll);
ca
parents: 16861
diff changeset
   903
	    if (limit > sz) limit = sz;
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   904
16862
ca
parents: 16861
diff changeset
   905
	    chars = (unsigned char *)(__stringVal(coll) + pos - 1);
ca
parents: 16861
diff changeset
   906
	    while (pos < limit) {
ca
parents: 16861
diff changeset
   907
		if (*chars == ch) {
ca
parents: 16861
diff changeset
   908
		    ch = *++chars;
ca
parents: 16861
diff changeset
   909
		    __INST(position) = __mkSmallInteger(pos);
ca
parents: 16861
diff changeset
   910
		    RETURN ( self );
ca
parents: 16861
diff changeset
   911
		}
ca
parents: 16861
diff changeset
   912
		chars++;
ca
parents: 16861
diff changeset
   913
		pos++;
ca
parents: 16861
diff changeset
   914
	    }
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   915
	    __INST(position) = __mkSmallInteger(pos);
16862
ca
parents: 16861
diff changeset
   916
	    RETURN ( nil );
ca
parents: 16861
diff changeset
   917
	}
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   918
    }
6011
3b91d7834ca5 fixed: skipThrough dod not position atEnd if the element was not found.
Claus Gittinger <cg@exept.de>
parents: 5810
diff changeset
   919
%}.
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   920
    ^ super skipThrough:anObject
16861
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   921
!
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   922
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   923
upTo:anObject
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   924
%{
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   925
    OBJ _collection = __INST(collection);
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   926
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   927
    if (__isString(_collection)
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   928
     && __isCharacter(anObject)) {
16862
ca
parents: 16861
diff changeset
   929
	unsigned int ch = __intVal(__characterVal(anObject));
16861
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   930
16862
ca
parents: 16861
diff changeset
   931
	if (ch <= 0xFF) {
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   932
	    int _startPos = __intVal(__INST(position));
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   933
	    int _endIndex;
16862
ca
parents: 16861
diff changeset
   934
	    char *startPtr = __stringVal(_collection) + _startPos;
ca
parents: 16861
diff changeset
   935
	    char *foundPtr;
ca
parents: 16861
diff changeset
   936
	    OBJ rslt;
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   937
	    int nMax;
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   938
16862
ca
parents: 16861
diff changeset
   939
	    _endIndex = __stringSize(_collection);
ca
parents: 16861
diff changeset
   940
	    if (__isInteger(__INST(readLimit))) {
ca
parents: 16861
diff changeset
   941
		int _readLimit = __intVal(__INST(readLimit));
16861
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   942
16862
ca
parents: 16861
diff changeset
   943
		if (_readLimit < _endIndex) _endIndex = _readLimit;
ca
parents: 16861
diff changeset
   944
	    }
16861
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   945
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   946
	    nMax = _endIndex-_startPos;
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   947
	    foundPtr = (char *)memchr( startPtr, ch, (long)nMax);
16862
ca
parents: 16861
diff changeset
   948
	    if (foundPtr == 0) {
ca
parents: 16861
diff changeset
   949
		// not found
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   950
		rslt = __MKEMPTYSTRING(nMax);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   951
		// refetch - may GC
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   952
		_collection = __INST(collection);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   953
		memcpy((void *)__stringVal(rslt), (void *)(__stringVal(_collection) + _startPos), (size_t)nMax);
16862
ca
parents: 16861
diff changeset
   954
		__INST(position) = __mkSmallInteger(_endIndex);
ca
parents: 16861
diff changeset
   955
	    } else {
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   956
		// found at foundPtr
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   957
		int n = foundPtr-startPtr;
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   958
17597
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   959
		rslt = __MKEMPTYSTRING(n);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   960
		// refetch - may GC
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   961
		_collection = __INST(collection);
a78c4a2bf366 ouch - bad call of MKSTRING_L passing a pointer into object memory
Claus Gittinger <cg@exept.de>
parents: 16882
diff changeset
   962
		memcpy((void *)__stringVal(rslt), (void *)(__stringVal(_collection) + _startPos), (size_t)n);
16882
d00fc1a07bf4 fix in upTo: for mac.
Claus Gittinger <cg@exept.de>
parents: 16862
diff changeset
   963
		__INST(position) = __mkSmallInteger(_startPos + n + 1);
16862
ca
parents: 16861
diff changeset
   964
	    }
ca
parents: 16861
diff changeset
   965
	    RETURN (rslt);
ca
parents: 16861
diff changeset
   966
	}
16861
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   967
    }
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   968
%}.
0595937d014a class: ReadStream
ca
parents: 16860
diff changeset
   969
    ^ super upTo:anObject
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   970
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   971
59
4a86aad06603 *** empty log message ***
claus
parents: 13
diff changeset
   972
!ReadStream methodsFor:'writing'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   973
a27a279701f8 Initial revision
claus
parents:
diff changeset
   974
nextPut:anElement
10
claus
parents: 5
diff changeset
   975
    "catch write access to readstreams - report an error"
claus
parents: 5
diff changeset
   976
claus
parents: 5
diff changeset
   977
    self shouldNotImplement
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   978
! !
611
80bb0f1a7bab checkin from browser
Claus Gittinger <cg@exept.de>
parents: 546
diff changeset
   979
2162
7e1601f633b6 ff is a separator too (in #skipSeparators*)
Claus Gittinger <cg@exept.de>
parents: 1688
diff changeset
   980
!ReadStream class methodsFor:'documentation'!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 611
diff changeset
   981
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 611
diff changeset
   982
version
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   983
    ^ '$Header: /cvs/stx/stx/libbasic/ReadStream.st,v 1.80 2015-03-12 17:10:39 stefan Exp $'
12176
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   984
!
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   985
44e86cdc5798 added: #next: - tuning
Claus Gittinger <cg@exept.de>
parents: 10599
diff changeset
   986
version_CVS
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   987
    ^ '$Header: /cvs/stx/stx/libbasic/ReadStream.st,v 1.80 2015-03-12 17:10:39 stefan Exp $'
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 611
diff changeset
   988
! !
17604
1e1d9d9f1d2e class: ReadStream
Stefan Vogel <sv@exept.de>
parents: 17597
diff changeset
   989