Packages June 2012

packages@lists.squeakfoundation.org

1 participants
135 discussions

The Trunk: KernelTests-nice.225.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

Nicolas Cellier uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-nice.225.mcz ==================== Summary ==================== Name: KernelTests-nice.225 Author: nice Time: 3 June 2012, 1:36:52.333 am UUID: 0618f9bc-673f-4402-80a5-209cae160b43 Ancestors: KernelTests-eem.224, KernelTests-nice.222 Merge nice.222 (test for reading Fraction from Stream) Complete the tests with some error conditions. =============== Diff against KernelTests-eem.224 =============== Item was added: + ----- Method: FractionTest>>testFractionReading (in category 'tests - printing') ----- + testFractionReading + "Numerator literal syntax" + self assert: (Fraction readFrom: '4') equals: 4. + self assert: (Fraction readFrom: '45') equals: 45. + self assert: (Fraction readFrom: '-45') equals: -45. + self assert: (Fraction readFrom: '4e2') equals: 400. + self assert: (Fraction readFrom: '33e-2') equals: 33/100. + self assert: (Fraction readFrom: '4r123') equals: 1 * 4 + 2 * 4 + 3. + self assert: (Fraction readFrom: '-4r123e5') equals: 1 * 4 + 2 * 4 + 3 * (4 raisedTo: 5) negated. + + "Numerator/Denominator literals syntax" + self assert: (Fraction readFrom: '23/17') equals: 23/17. + self assert: (Fraction readFrom: '-122/17') equals: -122/17. + self assert: (Fraction readFrom: '-3r21e4/8r57e6') equals: (2 * 3 + 1 * (3 raisedTo: 4)) negated /(5 * 8 + 7 * (8 raisedTo: 6)). + + "Decimal integer part.fraction part literal syntax" + self assert: (Fraction readFrom: '0.1') equals: 1/10. + self assert: (Fraction readFrom: '0.071') equals: 71/1000. + self assert: (Fraction readFrom: '-0.071e2') equals: -71/10. + self assert: (Fraction readFrom: '0.07100e-2') equals: 71/100000. + + "Extended syntax" + self assert: (Fraction readFrom: '+4') equals: 4. + self assert: (Fraction readFrom: '.13') equals: 13/100. + self assert: (Fraction readFrom: '30.e-2') equals: 3/10. + self assert: (Fraction readFrom: '+30.e+4') equals: 300000. + + "Errors" + self should: [(Fraction readFrom: '')] raise: Error. + self should: [(Fraction readFrom: '.')] raise: Error. + self should: [(Fraction readFrom: 'e3')] raise: Error. + self should: [(Fraction readFrom: '+e2')] raise: Error. + self should: [(Fraction readFrom: '-.e+2')] raise: Error. + self should: [(Fraction readFrom: '/2')] raise: Error.! Item was added: + ----- Method: FractionTest>>testFractionReadingBase (in category 'tests - printing') ----- + testFractionReadingBase + {17/25. -132/271. 127. -1000} do: [:fraction | + #(2 3 8 10 16) do: [:base | + | printed | + printed := (fraction printStringBase: base) copyWithoutAll: '()'. + self assert: (Fraction readFrom: printed base: base) equals: fraction]].!

1 0

The Trunk: KernelTests-nice.225.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

1 0

The Trunk: KernelTests-nice.225.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

1 0

The Trunk: Kernel-nice.693.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.693.mcz ==================== Summary ==================== Name: Kernel-nice.693 Author: nice Time: 3 June 2012, 1:36:01.517 am UUID: e88d4aab-9e87-4e64-82cd-0475d919faa5 Ancestors: Kernel-eem.692, Kernel-nice.692 Merge nice.692 (reading Fraction from Stream) add a comment to the postscript just to force a rehashAll. =============== Diff against Kernel-eem.692 =============== Item was removed: - (PackageInfo named: 'Kernel') preamble: ''! Item was added: + ----- Method: ExtendedNumberParser>>nextFraction (in category 'parsing-public') ----- + nextFraction + | numerator denominator numberOfTrailingZeroInIntegerPart | + base := 10. + neg := self peekSignIsMinus. + (integerPart := self nextUnsignedIntegerOrNilBase: base) + ifNil: [numberOfTrailingZeroInIntegerPart := 0] + ifNotNil: [ + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + self peekSignIsMinus + ifTrue: [neg := neg not]. + integerPart := self nextUnsignedIntegerBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero]]. + (sourceStream peekFor: $.) + ifTrue: + [^self readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart]. + integerPart + ifNil: + ["No integerPart, raise an error" + ^ self expected: 'a digit']. + numerator := neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]. + self readExponent ifTrue: [numerator := numerator * (base raisedToInteger: exponent)]. + (sourceStream peekFor: $/) ifFalse: [^numerator]. + base := 10. + (denominator := self nextUnsignedIntegerOrNilBase: base) + ifNil: + [sourceStream skip: -1. "Not a valid denominator, ungobble / and return numerator" + ^numerator]. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := denominator) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + denominator := self nextUnsignedIntegerBase: base]. + self readExponent ifTrue: [denominator := denominator * (base raisedToInteger: exponent)]. + ^numerator / denominator! Item was added: + ----- Method: ExtendedNumberParser>>readFractionPartNumberOfTrailingZeroInIntegerPart: (in category 'parsing-private') ----- + readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart + "at this stage, sign integerPart and a fraction point have been read. + try and form a number with a fractionPart" + + | numberOfNonZeroFractionDigits numberOfTrailingZeroInFractionPart mantissa value | + fractionPart := self nextUnsignedIntegerOrNilBase: base. + fractionPart + ifNil: [ + "No fractionPart found, but can be an extended 1.e2 syntax" + integerPart ifNil: ["No integerPart, nor fractionPart found, ungobble the fraction point and raise an error" + sourceStream skip: -1. + ^self expected: 'a digit']. + fractionPart := 0. + numberOfNonZeroFractionDigits := 0. + numberOfTrailingZeroInFractionPart := 0] + ifNotNil: [. + numberOfNonZeroFractionDigits := lastNonZero. + numberOfTrailingZeroInFractionPart := nDigits - lastNonZero]. + self readExponent. + integerPart ifNil: [integerPart := 0]. + + fractionPart isZero + ifTrue: [mantissa := integerPart + // (base raisedToInteger: numberOfTrailingZeroInIntegerPart). + exponent := exponent + numberOfTrailingZeroInIntegerPart] + ifFalse: [mantissa := integerPart + * (base raisedToInteger: numberOfNonZeroFractionDigits) + (fractionPart // (base raisedToInteger: numberOfTrailingZeroInFractionPart)). + exponent := exponent - numberOfNonZeroFractionDigits]. + + value := exponent positive + ifTrue: [mantissa * (base raisedToInteger: exponent)] + ifFalse: [mantissa / (base raisedToInteger: exponent negated)]. + ^ neg + ifTrue: [value negated] + ifFalse: [value]! Item was added: + ----- Method: Fraction class>>readFrom: (in category 'instance creation') ----- + readFrom: stringOrStream + "Answer a fraction as described on aStream. + The fraction may be specified as numerator/denominator, or just a numerator, or as integerPart.fractionPart. + In numerator/denominator form, both parts may have a radix specification and an exponent, but only numerator can have a sign. + In fractional digits form, an alternate radix and an exponent can also be provided, the integer or fraction part being optional." + + ^(ExtendedNumberParser on: stringOrStream) nextFraction! Item was added: + ----- Method: Fraction class>>readFrom:base: (in category 'instance creation') ----- + readFrom: stringOrStream base: aRadix + "Answer a Fraction as described on aStream. + The Fraction may be specified as numerator/denominator, or just with numerator. + Both numerator and denominator can have an exponent, but only numerator can have a sign." + + ^(ExtendedNumberParser on: stringOrStream) nextFractionBase: aRadix! Item was added: + ----- Method: NumberParser>>nextInteger (in category 'parsing-public') ----- + nextInteger + "Read an Integer from sourceStream, asnwser that Integer. + This is a generic version dealing with an optional sign and a simple sequence of decimal digits. + Subclass might define extended syntax." + + base := 10. + ^self nextIntegerBase: base ifFail: [^self expected: ('a digit between 0 and ' copyWith: (Character digitValue: base - 1))]! Item was added: + ----- Method: NumberParser>>nextUnsignedInteger (in category 'parsing-public') ----- + nextUnsignedInteger + "Read an Integer from sourceStream, asnwser that Integer. + This is a generic version dealing with a simple sequence of decimal digits. + Subclass might define extended syntax." + + base := 10. + ^self nextUnsignedIntegerBase: base ifFail: [^self expected: ('a digit between 0 and ' copyWith: (Character digitValue: base - 1))]! Item was added: + ----- Method: SqNumberParser>>nextFraction (in category 'parsing-public') ----- + nextFraction + | numerator denominator numberOfTrailingZeroInIntegerPart | + base := 10. + neg := self peekSignIsMinus. + (integerPart := self nextUnsignedIntegerOrNilBase: base) + ifNil: ["No integerPart, raise an error" + ^ self expected: 'a digit']. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + self peekSignIsMinus + ifTrue: [neg := neg not]. + integerPart := self nextUnsignedIntegerBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero]. + (sourceStream peekFor: $.) + ifTrue: + [^self readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart]. + numerator := neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]. + self readExponent ifTrue: [numerator := numerator * (base raisedToInteger: exponent)]. + (sourceStream peekFor: $/) ifFalse: [^numerator]. + base := 10. + (denominator := self nextUnsignedIntegerOrNilBase: base) + ifNil: + [sourceStream skip: -1. "Not a valid denominator, ungobble / and return numerator" + ^numerator]. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := denominator) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + denominator := self nextUnsignedIntegerBase: base]. + self readExponent ifTrue: [denominator := denominator * (base raisedToInteger: exponent)]. + ^numerator / denominator! Item was added: + ----- Method: SqNumberParser>>nextFractionBase: (in category 'parsing-public') ----- + nextFractionBase: aRadix + | numerator denominator | + base := aRadix. + neg := self peekSignIsMinus. + (integerPart := self nextUnsignedIntegerOrNilBase: base) + ifNil: [^self expected: 'a digit between 0 and ' , (Character digitValue: aRadix)]. + numerator := neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]. + self readExponent ifTrue: [numerator := numerator * (base raisedToInteger: exponent)]. + (sourceStream peekFor: $/) ifFalse: [^numerator]. + (denominator := self nextUnsignedIntegerOrNilBase: base) + ifNil: + [sourceStream skip: -1. "Not a valid denominator, ungobble / and return numerator" + ^numerator]. + self readExponent ifTrue: [denominator := denominator * (base raisedToInteger: exponent)]. + ^numerator / denominator! Item was added: + ----- Method: SqNumberParser>>nextInteger (in category 'parsing-public') ----- + nextInteger + "Read an Integer from sourceStream, asnwser that Integer. + In Smalltalk syntax, a radix can be specified, and an exponent too." + + | numberOfTrailingZeroInIntegerPart | + base := 10. + neg := self peekSignIsMinus. + integerPart := self nextUnsignedIntegerOrNilBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + self peekSignIsMinus + ifTrue: [neg := neg not]. + integerPart := self nextUnsignedIntegerBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero]. + ^ self makeIntegerOrScaledInteger! Item was added: + ----- Method: SqNumberParser>>nextUnsignedInteger (in category 'parsing-public') ----- + nextUnsignedInteger + "Read an unsigned Integer from sourceStream, asnwser that Integer. + In Smalltalk syntax, a radix can be specified, and an exponent too." + + base := 10. + neg := false. + integerPart := self nextUnsignedIntegerOrNilBase: base. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + integerPart := self nextUnsignedIntegerBase: base]. + ^ self makeIntegerOrScaledInteger! Item was added: + ----- Method: SqNumberParser>>readFractionPartNumberOfTrailingZeroInIntegerPart: (in category 'parsing-private') ----- + readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart + "at this stage, sign integerPart and a decimal point have been read. + try and form a number with a fractionPart" + + | numberOfNonZeroFractionDigits numberOfTrailingZeroInFractionPart mantissa value | + fractionPart := self nextUnsignedIntegerOrNilBase: base. + fractionPart ifNil: ["No fractionPart found, ungobble the decimal point and return the integerPart" + sourceStream skip: -1. + ^ neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]]. + numberOfNonZeroFractionDigits := lastNonZero. + numberOfTrailingZeroInFractionPart := nDigits - lastNonZero. + self readExponent. + fractionPart isZero + ifTrue: [mantissa := integerPart + // (base raisedToInteger: numberOfTrailingZeroInIntegerPart). + exponent := exponent + numberOfTrailingZeroInIntegerPart] + ifFalse: [mantissa := integerPart + * (base raisedToInteger: numberOfNonZeroFractionDigits) + (fractionPart // (base raisedToInteger: numberOfTrailingZeroInFractionPart)). + exponent := exponent - numberOfNonZeroFractionDigits]. + + value := exponent positive + ifTrue: [mantissa * (base raisedToInteger: exponent)] + ifFalse: [mantissa / (base raisedToInteger: exponent negated)]. + ^ neg + ifTrue: [value negated] + ifFalse: [value]! Item was changed: (PackageInfo named: 'Kernel') postscript: 'DateAndTime classPool at: #OffsetsAreValid put: true. Timespan withAllSubclassesDo: [ : each | each initialize ]. + HashedCollection rehashAll. + "add this comment for forcing a change detection and a rehashAll..."'! - HashedCollection rehashAll.'!

1 0

The Trunk: Kernel-nice.693.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

1 0

The Trunk: Kernel-nice.693.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

1 0

The Trunk: Kernel-nice.692.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.692.mcz ==================== Summary ==================== Name: Kernel-nice.692 Author: nice Time: 22 May 2012, 10:58:15.58 pm UUID: 11e38193-788b-4aa2-8480-a04d6afb2ec5 Ancestors: Kernel-nice.691 Let Fraction readFrom: '1/2' and Fraction readFrom: '0.1' answer the expected fractions. The sign, if any, must be attached to numerator. =============== Diff against Kernel-nice.691 =============== Item was added: + ----- Method: ExtendedNumberParser>>nextFraction (in category 'parsing-public') ----- + nextFraction + | numerator denominator numberOfTrailingZeroInIntegerPart | + base := 10. + neg := self peekSignIsMinus. + (integerPart := self nextUnsignedIntegerOrNilBase: base) + ifNil: [numberOfTrailingZeroInIntegerPart := 0] + ifNotNil: [ + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + self peekSignIsMinus + ifTrue: [neg := neg not]. + integerPart := self nextUnsignedIntegerBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero]]. + (sourceStream peekFor: $.) + ifTrue: + [^self readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart]. + integerPart + ifNil: + ["No integerPart, raise an error" + ^ self expected: 'a digit']. + numerator := neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]. + self readExponent ifTrue: [numerator := numerator * (base raisedToInteger: exponent)]. + (sourceStream peekFor: $/) ifFalse: [^numerator]. + base := 10. + (denominator := self nextUnsignedIntegerOrNilBase: base) + ifNil: + [sourceStream skip: -1. "Not a valid denominator, ungobble / and return numerator" + ^numerator]. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := denominator) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + denominator := self nextUnsignedIntegerBase: base]. + self readExponent ifTrue: [denominator := denominator * (base raisedToInteger: exponent)]. + ^numerator / denominator! Item was added: + ----- Method: ExtendedNumberParser>>readFractionPartNumberOfTrailingZeroInIntegerPart: (in category 'parsing-private') ----- + readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart + "at this stage, sign integerPart and a fraction point have been read. + try and form a number with a fractionPart" + + | numberOfNonZeroFractionDigits numberOfTrailingZeroInFractionPart mantissa value | + fractionPart := self nextUnsignedIntegerOrNilBase: base. + fractionPart + ifNil: [ + "No fractionPart found, but can be an extended 1.e2 syntax" + integerPart ifNil: ["No integerPart, nor fractionPart found, ungobble the fraction point and raise an error" + sourceStream skip: -1. + ^self expected: 'a digit']. + fractionPart := 0. + numberOfNonZeroFractionDigits := 0. + numberOfTrailingZeroInFractionPart := 0] + ifNotNil: [. + numberOfNonZeroFractionDigits := lastNonZero. + numberOfTrailingZeroInFractionPart := nDigits - lastNonZero]. + self readExponent. + integerPart ifNil: [integerPart := 0]. + + fractionPart isZero + ifTrue: [mantissa := integerPart + // (base raisedToInteger: numberOfTrailingZeroInIntegerPart). + exponent := exponent + numberOfTrailingZeroInIntegerPart] + ifFalse: [mantissa := integerPart + * (base raisedToInteger: numberOfNonZeroFractionDigits) + (fractionPart // (base raisedToInteger: numberOfTrailingZeroInFractionPart)). + exponent := exponent - numberOfNonZeroFractionDigits]. + + value := exponent positive + ifTrue: [mantissa * (base raisedToInteger: exponent)] + ifFalse: [mantissa / (base raisedToInteger: exponent negated)]. + ^ neg + ifTrue: [value negated] + ifFalse: [value]! Item was added: + ----- Method: Fraction class>>readFrom: (in category 'instance creation') ----- + readFrom: stringOrStream + "Answer a fraction as described on aStream. + The fraction may be specified as numerator/denominator, or just a numerator, or as integerPart.fractionPart. + In numerator/denominator form, both parts may have a radix specification and an exponent, but only numerator can have a sign. + In fractional digits form, an alternate radix and an exponent can also be provided, the integer or fraction part being optional." + + ^(ExtendedNumberParser on: stringOrStream) nextFraction! Item was added: + ----- Method: Fraction class>>readFrom:base: (in category 'instance creation') ----- + readFrom: stringOrStream base: aRadix + "Answer a Fraction as described on aStream. + The Fraction may be specified as numerator/denominator, or just with numerator. + Both numerator and denominator can have an exponent, but only numerator can have a sign." + + ^(ExtendedNumberParser on: stringOrStream) nextFractionBase: aRadix! Item was added: + ----- Method: NumberParser>>nextInteger (in category 'parsing-public') ----- + nextInteger + "Read an Integer from sourceStream, asnwser that Integer. + This is a generic version dealing with an optional sign and a simple sequence of decimal digits. + Subclass might define extended syntax." + + base := 10. + ^self nextIntegerBase: base ifFail: [^self expected: ('a digit between 0 and ' copyWith: (Character digitValue: base - 1))]! Item was added: + ----- Method: NumberParser>>nextUnsignedInteger (in category 'parsing-public') ----- + nextUnsignedInteger + "Read an Integer from sourceStream, asnwser that Integer. + This is a generic version dealing with a simple sequence of decimal digits. + Subclass might define extended syntax." + + base := 10. + ^self nextUnsignedIntegerBase: base ifFail: [^self expected: ('a digit between 0 and ' copyWith: (Character digitValue: base - 1))]! Item was added: + ----- Method: SqNumberParser>>nextFraction (in category 'parsing-public') ----- + nextFraction + | numerator denominator numberOfTrailingZeroInIntegerPart | + base := 10. + neg := self peekSignIsMinus. + (integerPart := self nextUnsignedIntegerOrNilBase: base) + ifNil: ["No integerPart, raise an error" + ^ self expected: 'a digit']. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + self peekSignIsMinus + ifTrue: [neg := neg not]. + integerPart := self nextUnsignedIntegerBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero]. + (sourceStream peekFor: $.) + ifTrue: + [^self readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart]. + numerator := neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]. + self readExponent ifTrue: [numerator := numerator * (base raisedToInteger: exponent)]. + (sourceStream peekFor: $/) ifFalse: [^numerator]. + base := 10. + (denominator := self nextUnsignedIntegerOrNilBase: base) + ifNil: + [sourceStream skip: -1. "Not a valid denominator, ungobble / and return numerator" + ^numerator]. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := denominator) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + denominator := self nextUnsignedIntegerBase: base]. + self readExponent ifTrue: [denominator := denominator * (base raisedToInteger: exponent)]. + ^numerator / denominator! Item was added: + ----- Method: SqNumberParser>>nextFractionBase: (in category 'parsing-public') ----- + nextFractionBase: aRadix + | numerator denominator | + base := aRadix. + neg := self peekSignIsMinus. + (integerPart := self nextUnsignedIntegerOrNilBase: base) + ifNil: [^self expected: 'a digit between 0 and ' , (Character digitValue: aRadix)]. + numerator := neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]. + self readExponent ifTrue: [numerator := numerator * (base raisedToInteger: exponent)]. + (sourceStream peekFor: $/) ifFalse: [^numerator]. + (denominator := self nextUnsignedIntegerOrNilBase: base) + ifNil: + [sourceStream skip: -1. "Not a valid denominator, ungobble / and return numerator" + ^numerator]. + self readExponent ifTrue: [denominator := denominator * (base raisedToInteger: exponent)]. + ^numerator / denominator! Item was added: + ----- Method: SqNumberParser>>nextInteger (in category 'parsing-public') ----- + nextInteger + "Read an Integer from sourceStream, asnwser that Integer. + In Smalltalk syntax, a radix can be specified, and an exponent too." + + | numberOfTrailingZeroInIntegerPart | + base := 10. + neg := self peekSignIsMinus. + integerPart := self nextUnsignedIntegerOrNilBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + self peekSignIsMinus + ifTrue: [neg := neg not]. + integerPart := self nextUnsignedIntegerBase: base. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero]. + ^ self makeIntegerOrScaledInteger! Item was added: + ----- Method: SqNumberParser>>nextUnsignedInteger (in category 'parsing-public') ----- + nextUnsignedInteger + "Read an unsigned Integer from sourceStream, asnwser that Integer. + In Smalltalk syntax, a radix can be specified, and an exponent too." + + base := 10. + neg := false. + integerPart := self nextUnsignedIntegerOrNilBase: base. + (sourceStream peekFor: $r) + ifTrue: ["<base>r<integer>" + (base := integerPart) < 2 + ifTrue: [ + sourceStream skip: -1. + ^ self expected: 'an integer greater than 1 as valid radix']. + integerPart := self nextUnsignedIntegerBase: base]. + ^ self makeIntegerOrScaledInteger! Item was added: + ----- Method: SqNumberParser>>readFractionPartNumberOfTrailingZeroInIntegerPart: (in category 'parsing-private') ----- + readFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart + "at this stage, sign integerPart and a decimal point have been read. + try and form a number with a fractionPart" + + | numberOfNonZeroFractionDigits numberOfTrailingZeroInFractionPart mantissa value | + fractionPart := self nextUnsignedIntegerOrNilBase: base. + fractionPart ifNil: ["No fractionPart found, ungobble the decimal point and return the integerPart" + sourceStream skip: -1. + ^ neg + ifTrue: [integerPart negated] + ifFalse: [integerPart]]. + numberOfNonZeroFractionDigits := lastNonZero. + numberOfTrailingZeroInFractionPart := nDigits - lastNonZero. + self readExponent. + fractionPart isZero + ifTrue: [mantissa := integerPart + // (base raisedToInteger: numberOfTrailingZeroInIntegerPart). + exponent := exponent + numberOfTrailingZeroInIntegerPart] + ifFalse: [mantissa := integerPart + * (base raisedToInteger: numberOfNonZeroFractionDigits) + (fractionPart // (base raisedToInteger: numberOfTrailingZeroInFractionPart)). + exponent := exponent - numberOfNonZeroFractionDigits]. + + value := exponent positive + ifTrue: [mantissa * (base raisedToInteger: exponent)] + ifFalse: [mantissa / (base raisedToInteger: exponent negated)]. + ^ neg + ifTrue: [value negated] + ifFalse: [value]!

1 0

The Trunk: Kernel-nice.692.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

1 0

The Trunk: Kernel-nice.692.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

1 0

The Trunk: KernelTests-nice.222.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

Nicolas Cellier uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-nice.222.mcz ==================== Summary ==================== Name: KernelTests-nice.222 Author: nice Time: 22 May 2012, 10:59:50.142 pm UUID: bf545579-1414-4840-b6b3-a846c58251b5 Ancestors: KernelTests-nice.221 Provides tests for Fraction readFrom: =============== Diff against KernelTests-nice.221 =============== Item was added: + ----- Method: FractionTest>>testFractionReading (in category 'tests - printing') ----- + testFractionReading + "Numerator literal syntax" + self assert: (Fraction readFrom: '4') equals: 4. + self assert: (Fraction readFrom: '45') equals: 45. + self assert: (Fraction readFrom: '-45') equals: -45. + self assert: (Fraction readFrom: '4e2') equals: 400. + self assert: (Fraction readFrom: '33e-2') equals: 33/100. + self assert: (Fraction readFrom: '4r123') equals: 1 * 4 + 2 * 4 + 3. + self assert: (Fraction readFrom: '-4r123e5') equals: 1 * 4 + 2 * 4 + 3 * (4 raisedTo: 5) negated. + + "Numerator/Denominator literals syntax" + self assert: (Fraction readFrom: '23/17') equals: 23/17. + self assert: (Fraction readFrom: '-122/17') equals: -122/17. + self assert: (Fraction readFrom: '-3r21e4/8r57e6') equals: (2 * 3 + 1 * (3 raisedTo: 4)) negated /(5 * 8 + 7 * (8 raisedTo: 6)). + + "Decimal integer part.fraction part literal syntax" + self assert: (Fraction readFrom: '0.1') equals: 1/10. + self assert: (Fraction readFrom: '0.071') equals: 71/1000. + self assert: (Fraction readFrom: '-0.071e2') equals: -71/10. + self assert: (Fraction readFrom: '0.07100e-2') equals: 71/100000. + + "Extended syntax" + self assert: (Fraction readFrom: '+4') equals: 4. + self assert: (Fraction readFrom: '.13') equals: 13/100. + self assert: (Fraction readFrom: '30.e-2') equals: 3/10. + self assert: (Fraction readFrom: '+30.e+4') equals: 300000.! Item was added: + ----- Method: FractionTest>>testFractionReadingBase (in category 'tests - printing') ----- + testFractionReadingBase + {17/25. -132/271. 127. -1000} do: [:fraction | + #(2 3 8 10 16) do: [:base | + | printed | + printed := (fraction printStringBase: base) copyWithoutAll: '()'. + self assert: (Fraction readFrom: printed base: base) equals: fraction]].!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages June 2012