--- a/Fraction.st Thu Feb 16 17:24:17 1995 +0100
+++ b/Fraction.st Thu Feb 16 17:24:49 1995 +0100
@@ -21,7 +21,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.12 1994-11-28 20:32:54 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.13 1995-02-16 16:24:30 claus Exp $
'!
!Fraction class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.12 1994-11-28 20:32:54 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.13 1995-02-16 16:24:30 claus Exp $
"
!
@@ -115,6 +115,15 @@
^ self == Fraction
! !
+!Fraction methodsFor:'queries'!
+
+isFraction
+ "return true, if the receiver is some kind of fraction;
+ true is returned here - the method is redefined from Object."
+
+ ^ true
+! !
+
!Fraction methodsFor:'accessing'!
numerator
@@ -209,7 +218,7 @@
(denominator = 1) ifFalse:[^ false].
^ numerator = aNumber
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
(numerator = aNumber numerator) ifFalse:[^ false].
^ denominator = aNumber denominator
].
@@ -224,7 +233,7 @@
(aNumber isMemberOf:SmallInteger) ifTrue:[
^ numerator > (denominator * aNumber)
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
^ (numerator * aNumber denominator) > (denominator * aNumber numerator)
].
^ self retry:#> coercing:aNumber
@@ -237,7 +246,7 @@
(aNumber isMemberOf:SmallInteger) ifTrue:[
^ numerator < (denominator * aNumber)
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
^ (numerator * aNumber denominator) < (denominator * aNumber numerator)
].
^ aNumber lessFromFraction:self
@@ -265,7 +274,7 @@
^ (self class numerator:(numerator + (denominator * aNumber))
denominator:denominator) reduced
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
n := aNumber numerator.
d := aNumber denominator.
@@ -292,7 +301,7 @@
^ (self class numerator:(numerator - (denominator * aNumber))
denominator:denominator) reduced
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
n := aNumber numerator.
d := aNumber denominator.
@@ -319,7 +328,7 @@
^ (self class numerator:(numerator * aNumber)
denominator:denominator) reduced
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
n := numerator * aNumber numerator.
d := denominator * aNumber denominator.
^ (self class numerator:n denominator:d) reduced
@@ -339,7 +348,7 @@
^ (self class numerator:numerator
denominator:(denominator * aNumber)) reduced
].
- (aNumber isKindOf:Fraction) ifTrue:[
+ aNumber isFraction ifTrue:[
n := numerator * aNumber denominator.
d := denominator * aNumber numerator.
^ (self class numerator:n denominator:d) reduced