Number.st
author claus
Mon, 08 May 1995 05:31:14 +0200
changeset 339 e8658d38abfb
parent 329 f14fc5ac11b7
child 345 cf2301210c47
permissions -rw-r--r--
.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     2
 COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
     3
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
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:'
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    21
COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    22
	      All Rights Reserved
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
    23
339
claus
parents: 329
diff changeset
    24
$Header: /cvs/stx/stx/libbasic/Number.st,v 1.16 1995-05-08 03:29:56 claus Exp $
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    25
'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    26
213
3b56a17534fd *** empty log message ***
claus
parents: 202
diff changeset
    27
!Number class methodsFor:'documentation'!
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    28
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    29
copyright
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    30
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    31
 COPYRIGHT (c) 1988 by Claus Gittinger
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    32
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    33
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    34
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    35
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    36
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    37
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    38
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    39
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    40
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    41
!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    42
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    43
version
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    44
"
339
claus
parents: 329
diff changeset
    45
$Header: /cvs/stx/stx/libbasic/Number.st,v 1.16 1995-05-08 03:29:56 claus Exp $
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    46
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    47
!
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    48
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    49
documentation
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    50
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    51
    abstract superclass for all kinds of numbers
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    52
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    53
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    54
213
3b56a17534fd *** empty log message ***
claus
parents: 202
diff changeset
    55
! Number methodsFor:'coercing & converting'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    56
a27a279701f8 Initial revision
claus
parents:
diff changeset
    57
@ aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
    58
    "return a Point with the receiver as x-coordinate and the argument
a27a279701f8 Initial revision
claus
parents:
diff changeset
    59
     as y-coordinate"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    60
a27a279701f8 Initial revision
claus
parents:
diff changeset
    61
%{  /* NOCONTEXT */
a27a279701f8 Initial revision
claus
parents:
diff changeset
    62
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
    63
    /*
56
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
    64
     * I cannot tell if this special code is worth anything
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
    65
     */
325
claus
parents: 296
diff changeset
    66
    if (_CanDoQuickNew(sizeof(struct __point))) {
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    67
	OBJ newPoint;
293
31df3850e98c *** empty log message ***
claus
parents: 213
diff changeset
    68
	int spc;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    69
325
claus
parents: 296
diff changeset
    70
	_qCheckedAlignedNew(newPoint, sizeof(struct __point));
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    71
	_InstPtr(newPoint)->o_class = Point;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    72
	_PointInstPtr(newPoint)->p_x = self;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    73
	_PointInstPtr(newPoint)->p_y = aNumber;
325
claus
parents: 296
diff changeset
    74
	spc = __qSpace(newPoint);
293
31df3850e98c *** empty log message ***
claus
parents: 213
diff changeset
    75
	__STORE_SPC(newPoint, aNumber, spc);
31df3850e98c *** empty log message ***
claus
parents: 213
diff changeset
    76
	__STORE_SPC(newPoint, self, spc);
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    77
	RETURN ( newPoint );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    78
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
    79
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
    80
.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    81
    ^ Point x:self y:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
    82
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    83
a27a279701f8 Initial revision
claus
parents:
diff changeset
    84
asPoint
a27a279701f8 Initial revision
claus
parents:
diff changeset
    85
    "return a new Point with the receiver as all coordinates;  
a27a279701f8 Initial revision
claus
parents:
diff changeset
    86
     often used to supply the same value in two dimensions, as with 
a27a279701f8 Initial revision
claus
parents:
diff changeset
    87
     symmetrical gridding or scaling."
a27a279701f8 Initial revision
claus
parents:
diff changeset
    88
a27a279701f8 Initial revision
claus
parents:
diff changeset
    89
%{  /* NOCONTEXT */
a27a279701f8 Initial revision
claus
parents:
diff changeset
    90
325
claus
parents: 296
diff changeset
    91
    if (_CanDoQuickNew(sizeof(struct __point))) {
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    92
	OBJ newPoint;
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    93
325
claus
parents: 296
diff changeset
    94
	_qCheckedAlignedNew(newPoint, sizeof(struct __point));
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    95
	_InstPtr(newPoint)->o_class = Point;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    96
	_PointInstPtr(newPoint)->p_x = self;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    97
	_PointInstPtr(newPoint)->p_y = self;
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    98
	__STORE(newPoint, self);
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
    99
	RETURN ( newPoint );
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   100
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
   101
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
   102
.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   103
    ^ Point x:self y:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   104
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   105
a27a279701f8 Initial revision
claus
parents:
diff changeset
   106
degreesToRadians
a27a279701f8 Initial revision
claus
parents:
diff changeset
   107
    "interpreting the receiver as radians, return the degrees"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   108
a27a279701f8 Initial revision
claus
parents:
diff changeset
   109
    ^ (self * (Float pi)) / 180.0
a27a279701f8 Initial revision
claus
parents:
diff changeset
   110
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   111
a27a279701f8 Initial revision
claus
parents:
diff changeset
   112
radiansToDegrees
a27a279701f8 Initial revision
claus
parents:
diff changeset
   113
    "interpreting the receiver as degrees, return the radians"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   114
a27a279701f8 Initial revision
claus
parents:
diff changeset
   115
    ^ (self * 180.0) / (Float pi)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   116
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   117
a27a279701f8 Initial revision
claus
parents:
diff changeset
   118
coerce:aNumber
39
bcf183a31bbb *** empty log message ***
claus
parents: 13
diff changeset
   119
    "return aNumber converted into receivers type"
bcf183a31bbb *** empty log message ***
claus
parents: 13
diff changeset
   120
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   121
    ^ self subclassResponsibility
a27a279701f8 Initial revision
claus
parents:
diff changeset
   122
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   123
a27a279701f8 Initial revision
claus
parents:
diff changeset
   124
generality
39
bcf183a31bbb *** empty log message ***
claus
parents: 13
diff changeset
   125
    "return the generality value - see ArithmeticValue>>retry:coercing:"
bcf183a31bbb *** empty log message ***
claus
parents: 13
diff changeset
   126
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   127
    ^ 40
a27a279701f8 Initial revision
claus
parents:
diff changeset
   128
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   129
a27a279701f8 Initial revision
claus
parents:
diff changeset
   130
retry:aSymbol coercing:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   131
    "Arithmetic represented by the binary operator, aSymbol,
a27a279701f8 Initial revision
claus
parents:
diff changeset
   132
    could not be performed with the receiver and the argument,
a27a279701f8 Initial revision
claus
parents:
diff changeset
   133
    aNumber, because of the differences in representation.  Coerce either
a27a279701f8 Initial revision
claus
parents:
diff changeset
   134
    the receiver or the argument, depending on which has higher generality, and
a27a279701f8 Initial revision
claus
parents:
diff changeset
   135
    try again.  If the operation is comapre for same value (=), return false if
a27a279701f8 Initial revision
claus
parents:
diff changeset
   136
    the argument is not a Number. 
a27a279701f8 Initial revision
claus
parents:
diff changeset
   137
    If the generalities are the same, create an error message."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   138
a27a279701f8 Initial revision
claus
parents:
diff changeset
   139
    |myGenerality otherGenerality|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   140
a27a279701f8 Initial revision
claus
parents:
diff changeset
   141
    (aSymbol == #=) ifTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   142
	(aNumber respondsTo:#generality) ifFalse:[^ false]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   143
    ] ifFalse:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   144
	(aNumber respondsTo:#generality) ifFalse:[
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   145
	    self error:'retry:coercing: argument is not a number'.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   146
	    ^ self
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   147
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   148
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   149
    myGenerality := self generality.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   150
    otherGenerality := aNumber generality.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   151
    (myGenerality > otherGenerality) ifTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   152
	^ self perform:aSymbol with:(self coerce:aNumber)
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   153
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   154
    (myGenerality < otherGenerality) ifTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   155
	^ (aNumber coerce:self) perform:aSymbol with:aNumber
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   156
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   157
    self error:'retry:coercing: oops - same generality'
a27a279701f8 Initial revision
claus
parents:
diff changeset
   158
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   159
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   160
!Number methodsFor:'testing'!
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   161
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   162
isLiteral
39
bcf183a31bbb *** empty log message ***
claus
parents: 13
diff changeset
   163
    "return true, if the receiver can be used as a literal
bcf183a31bbb *** empty log message ***
claus
parents: 13
diff changeset
   164
     (i.e. can be used in constant arrays)"
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   165
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   166
    ^ true
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   167
!
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   168
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   169
isNumber
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   170
    "return true, if the receiver is a kind of number"
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   171
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   172
    ^ true
329
claus
parents: 325
diff changeset
   173
!
claus
parents: 325
diff changeset
   174
claus
parents: 325
diff changeset
   175
isZero
claus
parents: 325
diff changeset
   176
    ^ self = 0
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   177
! !
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   178
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   179
!Number methodsFor:'printing & storing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   180
a27a279701f8 Initial revision
claus
parents:
diff changeset
   181
storeString
56
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   182
    "return a string for storing 
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   183
     - since numbers are literals, they store as they print."
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
   184
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   185
    ^ self printString
56
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   186
!
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   187
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   188
storeOn:aStream
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   189
    "append a string for storing the receiver onto the argument,
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   190
     aStream - since numbers are literals,they store as they print."
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   191
be0ed17e6f85 *** empty log message ***
claus
parents: 39
diff changeset
   192
    ^ self printOn:aStream
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   193
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   194
a27a279701f8 Initial revision
claus
parents:
diff changeset
   195
!Number methodsFor:'intervals'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   196
a27a279701f8 Initial revision
claus
parents:
diff changeset
   197
to:stop
a27a279701f8 Initial revision
claus
parents:
diff changeset
   198
    "return an interval from receiver up to the argument, incrementing by 1"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   199
a27a279701f8 Initial revision
claus
parents:
diff changeset
   200
    ^ Interval from:self to:stop
a27a279701f8 Initial revision
claus
parents:
diff changeset
   201
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   202
a27a279701f8 Initial revision
claus
parents:
diff changeset
   203
to:stop by:step
a27a279701f8 Initial revision
claus
parents:
diff changeset
   204
    "return an interval from receiver up to the argument, incrementing by step"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   205
a27a279701f8 Initial revision
claus
parents:
diff changeset
   206
    ^ Interval from:self to:stop by:step
a27a279701f8 Initial revision
claus
parents:
diff changeset
   207
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   208
a27a279701f8 Initial revision
claus
parents:
diff changeset
   209
!Number methodsFor:'iteration'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   210
a27a279701f8 Initial revision
claus
parents:
diff changeset
   211
timesRepeat:aBlock
a27a279701f8 Initial revision
claus
parents:
diff changeset
   212
    "evaluate the argument, aBlock self times"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   213
a27a279701f8 Initial revision
claus
parents:
diff changeset
   214
    |count|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   215
a27a279701f8 Initial revision
claus
parents:
diff changeset
   216
    count := self.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   217
    [count > 0] whileTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   218
	aBlock value.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   219
	count := count - 1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   220
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   221
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   222
a27a279701f8 Initial revision
claus
parents:
diff changeset
   223
to:stop do:aBlock
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   224
    "For each element of the interval from the receiver up to the argument stop,
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   225
     evaluate aBlock, passing the number as argument."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   226
a27a279701f8 Initial revision
claus
parents:
diff changeset
   227
    |tmp|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   228
a27a279701f8 Initial revision
claus
parents:
diff changeset
   229
    tmp := self.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   230
    [tmp <= stop] whileTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   231
	aBlock value:tmp.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   232
	tmp := tmp+1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   233
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   234
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   235
a27a279701f8 Initial revision
claus
parents:
diff changeset
   236
to:stop by:incr do:aBlock
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   237
    "For each element of the interval from the receiver up to the argument stop, incrementing
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   238
     by step, evaluate aBlock passing the element as argument."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   239
a27a279701f8 Initial revision
claus
parents:
diff changeset
   240
    |tmp|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   241
a27a279701f8 Initial revision
claus
parents:
diff changeset
   242
    tmp := self.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   243
    (incr > 0) ifTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   244
	[tmp <= stop] whileTrue:[
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   245
	    aBlock value:tmp.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   246
	    tmp := tmp+incr
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   247
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   248
    ] ifFalse:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   249
	[tmp >= stop] whileTrue:[
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   250
	    aBlock value:tmp.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   251
	    tmp := tmp+incr
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   252
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   253
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   254
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   255
a27a279701f8 Initial revision
claus
parents:
diff changeset
   256
!Number class methodsFor:'private'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   257
a27a279701f8 Initial revision
claus
parents:
diff changeset
   258
readMantissaFrom:aStream radix:radix
a27a279701f8 Initial revision
claus
parents:
diff changeset
   259
    "helper for readFrom: -
a27a279701f8 Initial revision
claus
parents:
diff changeset
   260
     return the mantissa from the (character-)stream aStream;
a27a279701f8 Initial revision
claus
parents:
diff changeset
   261
     no whitespace-skipping; error if no number available"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   262
a27a279701f8 Initial revision
claus
parents:
diff changeset
   263
    |nextChar value factor|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   264
a27a279701f8 Initial revision
claus
parents:
diff changeset
   265
    value := 0.0.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   266
    factor := 1.0 / radix.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   267
    nextChar := aStream peek.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   268
    [nextChar notNil and:[nextChar isDigitRadix:radix]] whileTrue:[
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   269
	value := value + (nextChar digitValue * factor).
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   270
	factor := factor / radix.
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   271
	nextChar := aStream nextPeek
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   272
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   273
    ^ value
a27a279701f8 Initial revision
claus
parents:
diff changeset
   274
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   275
a27a279701f8 Initial revision
claus
parents:
diff changeset
   276
!Number class methodsFor:'instance creation'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   277
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   278
readFrom:aStream onError:exceptionBlock
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   279
    "return the next Number from the (character-)stream aStream;
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   280
     skipping all whitespace first; return the value of exceptionBlock,
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   281
     if no number can be read."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   282
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   283
    |nextChar radix value negative signExp freakOut|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   284
339
claus
parents: 329
diff changeset
   285
    Object errorSignal handle:[:ex |
claus
parents: 329
diff changeset
   286
	^ exceptionBlock value
claus
parents: 329
diff changeset
   287
    ] do:[
claus
parents: 329
diff changeset
   288
	nextChar := aStream skipSeparators.
claus
parents: 329
diff changeset
   289
	nextChar isNil ifTrue:[^ exceptionBlock value].
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   290
339
claus
parents: 329
diff changeset
   291
	freakOut := [^ exceptionBlock value].
claus
parents: 329
diff changeset
   292
claus
parents: 329
diff changeset
   293
	(nextChar == $-) ifTrue:[
claus
parents: 329
diff changeset
   294
	    negative := true.
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   295
	    nextChar := aStream nextPeek
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   296
	] ifFalse:[
339
claus
parents: 329
diff changeset
   297
	    negative := false.
claus
parents: 329
diff changeset
   298
	    (nextChar == $+) ifTrue:[
claus
parents: 329
diff changeset
   299
		nextChar := aStream nextPeek
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   300
	    ]
40ca7cc6fb9c *** empty log message ***
claus
parents: 93
diff changeset
   301
	].
339
claus
parents: 329
diff changeset
   302
	nextChar isDigit ifFalse:[
claus
parents: 329
diff changeset
   303
	    ^ exceptionBlock value.
claus
parents: 329
diff changeset
   304
"/          value := super readFrom:aStream.
claus
parents: 329
diff changeset
   305
"/          negative ifTrue:[value := value negated].
claus
parents: 329
diff changeset
   306
"/          ^ value
claus
parents: 329
diff changeset
   307
	].
claus
parents: 329
diff changeset
   308
	value := Integer readFrom:aStream radix:10 onError:freakOut.
claus
parents: 329
diff changeset
   309
	nextChar := aStream peek.
claus
parents: 329
diff changeset
   310
	((nextChar == $r) or:[ nextChar == $R]) ifTrue:[
claus
parents: 329
diff changeset
   311
	    aStream next.
claus
parents: 329
diff changeset
   312
	    radix := value.
claus
parents: 329
diff changeset
   313
	    value := Integer readFrom:aStream radix:radix onError:freakOut.
claus
parents: 329
diff changeset
   314
	] ifFalse:[
claus
parents: 329
diff changeset
   315
	    radix := 10
claus
parents: 329
diff changeset
   316
	].
claus
parents: 329
diff changeset
   317
	(nextChar == $.) ifTrue:[
claus
parents: 329
diff changeset
   318
	    nextChar := aStream nextPeek.
claus
parents: 329
diff changeset
   319
	    (nextChar notNil and:[nextChar isDigitRadix:radix]) ifTrue:[
claus
parents: 329
diff changeset
   320
		value := value asFloat 
claus
parents: 329
diff changeset
   321
			 + (Number readMantissaFrom:aStream radix:radix).
claus
parents: 329
diff changeset
   322
		nextChar := aStream peek
claus
parents: 329
diff changeset
   323
	    ]
claus
parents: 329
diff changeset
   324
	].
claus
parents: 329
diff changeset
   325
	((nextChar == $e) or:[nextChar == $E]) ifTrue:[
claus
parents: 329
diff changeset
   326
	    nextChar := aStream nextPeek.
claus
parents: 329
diff changeset
   327
	    signExp := 1.
claus
parents: 329
diff changeset
   328
	    (nextChar == $+) ifTrue:[
claus
parents: 329
diff changeset
   329
		nextChar := aStream nextPeek
claus
parents: 329
diff changeset
   330
	    ] ifFalse:[
claus
parents: 329
diff changeset
   331
		(nextChar == $-) ifTrue:[
claus
parents: 329
diff changeset
   332
		    nextChar := aStream nextPeek.
claus
parents: 329
diff changeset
   333
		    signExp := -1
claus
parents: 329
diff changeset
   334
		]
claus
parents: 329
diff changeset
   335
	    ].
claus
parents: 329
diff changeset
   336
	    (nextChar notNil and:[(nextChar isDigitRadix:radix)]) ifTrue:[
claus
parents: 329
diff changeset
   337
		value := value asFloat 
claus
parents: 329
diff changeset
   338
			 * (10.0 raisedToInteger:
claus
parents: 329
diff changeset
   339
				    ((Integer readFrom:aStream radix:radix onError:freakOut) * signExp))
claus
parents: 329
diff changeset
   340
	    ]
claus
parents: 329
diff changeset
   341
	].
claus
parents: 329
diff changeset
   342
	negative ifTrue:[
claus
parents: 329
diff changeset
   343
	    ^ value negated
claus
parents: 329
diff changeset
   344
	].
claus
parents: 329
diff changeset
   345
	^ value
claus
parents: 329
diff changeset
   346
    ]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   347
329
claus
parents: 325
diff changeset
   348
    "
claus
parents: 325
diff changeset
   349
     Number readFrom:(ReadStream on:'54.32e-01')      
claus
parents: 325
diff changeset
   350
     Number readFrom:(ReadStream on:'12345678901234567890') 
claus
parents: 325
diff changeset
   351
     Number readFrom:(ReadStream on:'16rAAAAFFFFAAAAFFFF') 
claus
parents: 325
diff changeset
   352
     '+00000123.45' asNumber  
claus
parents: 325
diff changeset
   353
    "
296
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   354
!
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   355
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   356
readSmalltalkSyntaxFrom:aStream
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   357
    "ST-80 compatibility (thanks to a note from alpha testers)
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   358
     read and return the next Number in smalltalk syntax from the 
329
claus
parents: 325
diff changeset
   359
     (character-)stream aStream."
claus
parents: 325
diff changeset
   360
claus
parents: 325
diff changeset
   361
    ^ Compiler evaluate:aStream compile:false "/ self readFrom:aStream.
296
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   362
329
claus
parents: 325
diff changeset
   363
    "
claus
parents: 325
diff changeset
   364
     Number readSmalltalkSyntaxFrom:(ReadStream on:'54.32e-01')    
claus
parents: 325
diff changeset
   365
     Number readSmalltalkSyntaxFrom:(ReadStream on:'12345678901234567890')
claus
parents: 325
diff changeset
   366
     Number readSmalltalkSyntaxFrom:(ReadStream on:'16rAAAAFFFFAAAAFFFF')
claus
parents: 325
diff changeset
   367
     Number readSmalltalkSyntaxFrom:(ReadStream on:'(1/10)') 
claus
parents: 325
diff changeset
   368
     Number readFrom:(ReadStream on:'(1/10)') 
claus
parents: 325
diff changeset
   369
     Number readSmalltalkSyntaxFrom:(ReadStream on:'+00000123.45')  
claus
parents: 325
diff changeset
   370
     Number readFrom:(ReadStream on:'+00000123.45')  
claus
parents: 325
diff changeset
   371
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   372
! !