Number.st
author claus
Wed, 13 Oct 1993 03:14:32 +0100
changeset 5 67342904af11
parent 3 24d81bf47225
child 13 62303f84ff5f
permissions -rw-r--r--
*** empty log message ***
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     2
 COPYRIGHT (c) 1988 by Claus Gittinger
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     3
              All Rights Reserved
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    12
a27a279701f8 Initial revision
claus
parents:
diff changeset
    13
ArithmeticValue subclass:#Number
a27a279701f8 Initial revision
claus
parents:
diff changeset
    14
       instanceVariableNames:''
a27a279701f8 Initial revision
claus
parents:
diff changeset
    15
       classVariableNames:''
a27a279701f8 Initial revision
claus
parents:
diff changeset
    16
       poolDictionaries:''
a27a279701f8 Initial revision
claus
parents:
diff changeset
    17
       category:'Magnitude-Numbers'
a27a279701f8 Initial revision
claus
parents:
diff changeset
    18
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    19
a27a279701f8 Initial revision
claus
parents:
diff changeset
    20
Number comment:'
a27a279701f8 Initial revision
claus
parents:
diff changeset
    21
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
    22
COPYRIGHT (c) 1988 by Claus Gittinger
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    23
              All Rights Reserved
a27a279701f8 Initial revision
claus
parents:
diff changeset
    24
a27a279701f8 Initial revision
claus
parents:
diff changeset
    25
abstract superclass for all kinds of numbers
a27a279701f8 Initial revision
claus
parents:
diff changeset
    26
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
    27
$Header: /cvs/stx/stx/libbasic/Number.st,v 1.4 1993-10-13 02:12:54 claus Exp $
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    28
'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    29
a27a279701f8 Initial revision
claus
parents:
diff changeset
    30
! Number methodsFor:'converting' !
a27a279701f8 Initial revision
claus
parents:
diff changeset
    31
a27a279701f8 Initial revision
claus
parents:
diff changeset
    32
@ aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
    33
    "return a Point with the receiver as x-coordinate and the argument
a27a279701f8 Initial revision
claus
parents:
diff changeset
    34
     as y-coordinate"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    35
a27a279701f8 Initial revision
claus
parents:
diff changeset
    36
%{  /* NOCONTEXT */
a27a279701f8 Initial revision
claus
parents:
diff changeset
    37
a27a279701f8 Initial revision
claus
parents:
diff changeset
    38
    extern char *newNextPtr, *newEndPtr;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    39
a27a279701f8 Initial revision
claus
parents:
diff changeset
    40
    if (_CanDoQuickNew(sizeof(struct point))) {
a27a279701f8 Initial revision
claus
parents:
diff changeset
    41
        OBJ newPoint;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    42
a27a279701f8 Initial revision
claus
parents:
diff changeset
    43
        _qCheckedAlignedNew(newPoint, sizeof(struct point), __context);
a27a279701f8 Initial revision
claus
parents:
diff changeset
    44
        _InstPtr(newPoint)->o_class = Point;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    45
        _PointInstPtr(newPoint)->p_x = self;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    46
        _PointInstPtr(newPoint)->p_y = aNumber;
2
claus
parents: 1
diff changeset
    47
        /*
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    48
         * no store check needed for self: self is a number, new object is definitely in newSpace
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    49
         * however, argument may be a context/block
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    50
         */
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    51
        __STORE(newPoint, aNumber);
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    52
        RETURN ( newPoint );
a27a279701f8 Initial revision
claus
parents:
diff changeset
    53
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
    54
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
    55
.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    56
    ^ Point x:self y:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
    57
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    58
a27a279701f8 Initial revision
claus
parents:
diff changeset
    59
asPoint
a27a279701f8 Initial revision
claus
parents:
diff changeset
    60
    "return a new Point with the receiver as all coordinates;  
a27a279701f8 Initial revision
claus
parents:
diff changeset
    61
     often used to supply the same value in two dimensions, as with 
a27a279701f8 Initial revision
claus
parents:
diff changeset
    62
     symmetrical gridding or scaling."
a27a279701f8 Initial revision
claus
parents:
diff changeset
    63
a27a279701f8 Initial revision
claus
parents:
diff changeset
    64
%{  /* NOCONTEXT */
a27a279701f8 Initial revision
claus
parents:
diff changeset
    65
a27a279701f8 Initial revision
claus
parents:
diff changeset
    66
    extern char *newNextPtr, *newEndPtr;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    67
a27a279701f8 Initial revision
claus
parents:
diff changeset
    68
    if (_CanDoQuickNew(sizeof(struct point))) {
a27a279701f8 Initial revision
claus
parents:
diff changeset
    69
        OBJ newPoint;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    70
2
claus
parents: 1
diff changeset
    71
        _qCheckedAlignedNew(newPoint, sizeof(struct point), __context);
claus
parents: 1
diff changeset
    72
        _InstPtr(newPoint)->o_class = Point;
claus
parents: 1
diff changeset
    73
        _PointInstPtr(newPoint)->p_x = self;
claus
parents: 1
diff changeset
    74
        _PointInstPtr(newPoint)->p_y = self;
claus
parents: 1
diff changeset
    75
        /* 
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    76
         * no store check needed - its definitely in newSpace
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    77
         * and self is a number
2
claus
parents: 1
diff changeset
    78
         */
claus
parents: 1
diff changeset
    79
        RETURN ( newPoint );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    80
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
    81
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
    82
.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    83
    ^ Point x:self y:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
    84
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    85
a27a279701f8 Initial revision
claus
parents:
diff changeset
    86
degreesToRadians
a27a279701f8 Initial revision
claus
parents:
diff changeset
    87
    "interpreting the receiver as radians, return the degrees"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    88
a27a279701f8 Initial revision
claus
parents:
diff changeset
    89
    ^ (self * (Float pi)) / 180.0
a27a279701f8 Initial revision
claus
parents:
diff changeset
    90
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    91
a27a279701f8 Initial revision
claus
parents:
diff changeset
    92
radiansToDegrees
a27a279701f8 Initial revision
claus
parents:
diff changeset
    93
    "interpreting the receiver as degrees, return the radians"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    94
a27a279701f8 Initial revision
claus
parents:
diff changeset
    95
    ^ (self * 180.0) / (Float pi)
a27a279701f8 Initial revision
claus
parents:
diff changeset
    96
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    97
a27a279701f8 Initial revision
claus
parents:
diff changeset
    98
coerce:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
    99
    ^ self subclassResponsibility
a27a279701f8 Initial revision
claus
parents:
diff changeset
   100
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   101
a27a279701f8 Initial revision
claus
parents:
diff changeset
   102
generality
a27a279701f8 Initial revision
claus
parents:
diff changeset
   103
    ^ 40
a27a279701f8 Initial revision
claus
parents:
diff changeset
   104
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   105
a27a279701f8 Initial revision
claus
parents:
diff changeset
   106
retry:aSymbol coercing:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   107
    "Arithmetic represented by the binary operator, aSymbol,
a27a279701f8 Initial revision
claus
parents:
diff changeset
   108
    could not be performed with the receiver and the argument,
a27a279701f8 Initial revision
claus
parents:
diff changeset
   109
    aNumber, because of the differences in representation.  Coerce either
a27a279701f8 Initial revision
claus
parents:
diff changeset
   110
    the receiver or the argument, depending on which has higher generality, and
a27a279701f8 Initial revision
claus
parents:
diff changeset
   111
    try again.  If the operation is comapre for same value (=), return false if
a27a279701f8 Initial revision
claus
parents:
diff changeset
   112
    the argument is not a Number. 
a27a279701f8 Initial revision
claus
parents:
diff changeset
   113
    If the generalities are the same, create an error message."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   114
a27a279701f8 Initial revision
claus
parents:
diff changeset
   115
    |myGenerality otherGenerality|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   116
a27a279701f8 Initial revision
claus
parents:
diff changeset
   117
    (aSymbol == #=) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   118
        (aNumber respondsTo:#generality) ifFalse:[^ false]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   119
    ] ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   120
        (aNumber respondsTo:#generality) ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   121
            self error:'retry:coercing: argument is not a number'.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   122
            ^ self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   123
        ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   124
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   125
    myGenerality := self generality.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   126
    otherGenerality := aNumber generality.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   127
    (myGenerality > otherGenerality) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   128
        ^ self perform:aSymbol with:(self coerce:aNumber)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   129
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   130
    (myGenerality < otherGenerality) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   131
        ^ (aNumber coerce:self) perform:aSymbol with:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   132
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   133
    self error:'retry:coercing: oops - same generality'
a27a279701f8 Initial revision
claus
parents:
diff changeset
   134
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   135
a27a279701f8 Initial revision
claus
parents:
diff changeset
   136
!Number methodsFor:'printing & storing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   137
a27a279701f8 Initial revision
claus
parents:
diff changeset
   138
storeString
a27a279701f8 Initial revision
claus
parents:
diff changeset
   139
    ^ self printString
a27a279701f8 Initial revision
claus
parents:
diff changeset
   140
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   141
a27a279701f8 Initial revision
claus
parents:
diff changeset
   142
!Number methodsFor:'intervals'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   143
a27a279701f8 Initial revision
claus
parents:
diff changeset
   144
to:stop
a27a279701f8 Initial revision
claus
parents:
diff changeset
   145
    "return an interval from receiver up to the argument, incrementing by 1"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   146
a27a279701f8 Initial revision
claus
parents:
diff changeset
   147
    ^ Interval from:self to:stop
a27a279701f8 Initial revision
claus
parents:
diff changeset
   148
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   149
a27a279701f8 Initial revision
claus
parents:
diff changeset
   150
to:stop by:step
a27a279701f8 Initial revision
claus
parents:
diff changeset
   151
    "return an interval from receiver up to the argument, incrementing by step"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   152
a27a279701f8 Initial revision
claus
parents:
diff changeset
   153
    ^ Interval from:self to:stop by:step
a27a279701f8 Initial revision
claus
parents:
diff changeset
   154
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   155
a27a279701f8 Initial revision
claus
parents:
diff changeset
   156
!Number methodsFor:'iteration'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   157
a27a279701f8 Initial revision
claus
parents:
diff changeset
   158
timesRepeat:aBlock
a27a279701f8 Initial revision
claus
parents:
diff changeset
   159
    "evaluate the argument, aBlock self times"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   160
a27a279701f8 Initial revision
claus
parents:
diff changeset
   161
    |count|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   162
a27a279701f8 Initial revision
claus
parents:
diff changeset
   163
    count := self.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   164
    [count > 0] whileTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   165
        aBlock value.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   166
        count := count - 1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   167
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   168
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   169
a27a279701f8 Initial revision
claus
parents:
diff changeset
   170
to:stop do:aBlock
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   171
    "For each element of the interval from the receiver up to the argument stop,
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   172
     evaluate aBlock, passing the number as argument."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   173
a27a279701f8 Initial revision
claus
parents:
diff changeset
   174
    |tmp|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   175
a27a279701f8 Initial revision
claus
parents:
diff changeset
   176
    tmp := self.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   177
    [tmp <= stop] whileTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   178
        aBlock value:tmp.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   179
        tmp := tmp+1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   180
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   181
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   182
a27a279701f8 Initial revision
claus
parents:
diff changeset
   183
to:stop by:incr do:aBlock
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   184
    "For each element of the interval from the receiver up to the argument stop, incrementing
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   185
     by step, evaluate aBlock passing the element as argument."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   186
a27a279701f8 Initial revision
claus
parents:
diff changeset
   187
    |tmp|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   188
a27a279701f8 Initial revision
claus
parents:
diff changeset
   189
    tmp := self.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   190
    (incr > 0) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   191
        [tmp <= stop] whileTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   192
            aBlock value:tmp.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   193
            tmp := tmp+incr
a27a279701f8 Initial revision
claus
parents:
diff changeset
   194
        ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   195
    ] ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   196
        [tmp >= stop] whileTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   197
            aBlock value:tmp.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   198
            tmp := tmp+incr
a27a279701f8 Initial revision
claus
parents:
diff changeset
   199
        ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   200
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   201
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   202
a27a279701f8 Initial revision
claus
parents:
diff changeset
   203
!Number class methodsFor:'private'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   204
a27a279701f8 Initial revision
claus
parents:
diff changeset
   205
readMantissaFrom:aStream radix:radix
a27a279701f8 Initial revision
claus
parents:
diff changeset
   206
    "helper for readFrom: -
a27a279701f8 Initial revision
claus
parents:
diff changeset
   207
     return the mantissa from the (character-)stream aStream;
a27a279701f8 Initial revision
claus
parents:
diff changeset
   208
     no whitespace-skipping; error if no number available"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   209
a27a279701f8 Initial revision
claus
parents:
diff changeset
   210
    |nextChar value factor|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   211
a27a279701f8 Initial revision
claus
parents:
diff changeset
   212
    value := 0.0.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   213
    factor := 1.0 / radix.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   214
    nextChar := aStream peek.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   215
    [nextChar notNil and:[nextChar isDigitRadix:radix]] whileTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   216
        value := value + (nextChar digitValue * factor).
a27a279701f8 Initial revision
claus
parents:
diff changeset
   217
        factor := factor / radix.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   218
        nextChar := aStream nextPeek
a27a279701f8 Initial revision
claus
parents:
diff changeset
   219
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   220
    ^ value
a27a279701f8 Initial revision
claus
parents:
diff changeset
   221
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   222
a27a279701f8 Initial revision
claus
parents:
diff changeset
   223
!Number class methodsFor:'instance creation'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   224
a27a279701f8 Initial revision
claus
parents:
diff changeset
   225
readFrom:aStream
a27a279701f8 Initial revision
claus
parents:
diff changeset
   226
    "return the next Number from the (character-)stream aStream;
a27a279701f8 Initial revision
claus
parents:
diff changeset
   227
     skipping all whitespace first; return nil if no number"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   228
a27a279701f8 Initial revision
claus
parents:
diff changeset
   229
    |nextChar radix value negative signExp|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   230
a27a279701f8 Initial revision
claus
parents:
diff changeset
   231
    nextChar := aStream skipSeparators.
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   232
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   233
    nextChar isNil ifTrue:[
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   234
        "what should be returned at end-of-input ?"
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   235
        ^ nil
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   236
    ].
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   237
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   238
    (nextChar == $-) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   239
        negative := true.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   240
        nextChar := aStream nextPeek
a27a279701f8 Initial revision
claus
parents:
diff changeset
   241
    ] ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   242
        negative := false
a27a279701f8 Initial revision
claus
parents:
diff changeset
   243
    ].
2
claus
parents: 1
diff changeset
   244
    nextChar isDigit ifFalse:[
claus
parents: 1
diff changeset
   245
        value := super readFrom:aStream.
claus
parents: 1
diff changeset
   246
        negative ifTrue:[value := value negated].
claus
parents: 1
diff changeset
   247
        ^ value
claus
parents: 1
diff changeset
   248
    ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   249
    value := Integer readFrom:aStream radix:10.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   250
    nextChar := aStream peek.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   251
    ((nextChar == $r) or:[ nextChar == $R]) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   252
        aStream next.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   253
        radix := value.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   254
        value := Integer readFrom:aStream radix:radix
a27a279701f8 Initial revision
claus
parents:
diff changeset
   255
    ] ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   256
        radix := 10
a27a279701f8 Initial revision
claus
parents:
diff changeset
   257
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   258
    (nextChar == $.) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   259
        nextChar := aStream nextPeek.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   260
        (nextChar notNil and:[nextChar isDigitRadix:radix]) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   261
            value := value asFloat + (Number readMantissaFrom:aStream
a27a279701f8 Initial revision
claus
parents:
diff changeset
   262
                                                        radix:radix).
a27a279701f8 Initial revision
claus
parents:
diff changeset
   263
            nextChar := aStream peek
a27a279701f8 Initial revision
claus
parents:
diff changeset
   264
        ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   265
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   266
    ((nextChar == $e) or:[nextChar == $E]) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   267
        nextChar := aStream nextPeek.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   268
        signExp := 1.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   269
        (nextChar == $+) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   270
            nextChar := aStream nextPeek
a27a279701f8 Initial revision
claus
parents:
diff changeset
   271
        ] ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   272
            (nextChar == $-) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   273
                nextChar := aStream nextPeek.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   274
                signExp := -1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   275
            ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   276
        ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   277
        (nextChar notNil and:[(nextChar isDigitRadix:radix)]) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   278
            value := value asFloat 
a27a279701f8 Initial revision
claus
parents:
diff changeset
   279
                     * (10.0 raisedToInteger:
a27a279701f8 Initial revision
claus
parents:
diff changeset
   280
                                ((Integer readFrom:aStream 
a27a279701f8 Initial revision
claus
parents:
diff changeset
   281
                                             radix:radix) * signExp))
a27a279701f8 Initial revision
claus
parents:
diff changeset
   282
        ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   283
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   284
    negative ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   285
        ^ value negated
a27a279701f8 Initial revision
claus
parents:
diff changeset
   286
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   287
    ^ value
a27a279701f8 Initial revision
claus
parents:
diff changeset
   288
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   289
    "Number readFrom:(ReadStream on:'54.32e-01')"
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   290
    "Number readFrom:(ReadStream on:'12345678901234567890')"
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   291
    "Number readFrom:(ReadStream on:'16rAAAAFFFFAAAAFFFF')"
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   292
    "Number readFrom:(ReadStream on:'(1/10)')"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   293
! !