Squeak-dev June 2012

squeak-dev@lists.squeakfoundation.org

41 participants
155 discussions

The Trunk: EToys-cmm.88.mcz
by commits＠source.squeak.org 04 Jun '12

04 Jun '12

Chris Muller uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-cmm.88.mcz ==================== Summary ==================== Name: EToys-cmm.88 Author: cmm Time: 23 May 2012, 6:40:31.544 pm UUID: dfeec093-000c-4e1e-99b4-fa6e65b6fb28 Ancestors: EToys-dtl.87 - Move three Etoys-only methods from Morphic. =============== Diff against EToys-dtl.87 =============== Item was added: + ----- Method: Morph>>isCandidateForAutomaticViewing (in category '*Etoys-support') ----- + isCandidateForAutomaticViewing + ^ true! Item was added: + ----- Method: PasteUpMorph>>isCandidateForAutomaticViewing (in category '*Etoys-support') ----- + isCandidateForAutomaticViewing + "A viewer on a world is a dangerous thing to get casually!!" + + ^ self isWorldMorph not! Item was added: + ----- Method: SystemWindow>>isCandidateForAutomaticViewing (in category '*Etoys-support') ----- + isCandidateForAutomaticViewing + ^ false!

1 0

The Trunk: Morphic-cmm.620.mcz
by commits＠source.squeak.org 04 Jun '12

04 Jun '12

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.620.mcz ==================== Summary ==================== Name: Morphic-cmm.620 Author: cmm Time: 4 June 2012, 3:55:02.935 pm UUID: 0ddf089c-043a-47fe-b5ee-6e3759094f35 Ancestors: Morphic-cmm.619 - Simply extract the criteria for whether a morph should handle MouseMoveEvents into Morph>>#handleMouseMove: so subclasses can override. - Moved a few Etoys methods to the Etoys package. - Make findAFileList: find one without unaccepted edits, so it does not force the user to save just to have a navigable FileList. - Mark some unused methods as such. =============== Diff against Morphic-bf.618 =============== Item was changed: ----- Method: Morph>>handleMouseMove: (in category 'events-processing') ----- + handleMouseMove: anEvent - handleMouseMove: anEvent "System level event handling." + anEvent wasHandled ifTrue: [ ^ self ]. + "not interested" + (self handlesMouseMove: anEvent) ifFalse: [ ^ self ]. - anEvent wasHandled ifTrue:[^self]. "not interested" - "Rules say that by default a morph gets #mouseMove iff - * the hand is not dragging anything, - + and some button is down, - + and the receiver is the current mouse focus." - (anEvent hand hasSubmorphs) ifTrue:[^self]. - (anEvent anyButtonPressed and:[anEvent hand mouseFocus == self]) ifFalse:[^self]. anEvent wasHandled: true. self mouseMove: anEvent. + (self handlesMouseStillDown: anEvent) ifTrue: + [ "Step at the new location" + self + startStepping: #handleMouseStillDown: - (self handlesMouseStillDown: anEvent) ifTrue:[ - "Step at the new location" - self startStepping: #handleMouseStillDown: at: Time millisecondClockValue arguments: {anEvent copy resetHandlerFields} + stepTime: self mouseStillDownStepRate ]! - stepTime: self mouseStillDownStepRate ]. - ! Item was added: + ----- Method: Morph>>handlesMouseMove: (in category 'event handling') ----- + handlesMouseMove: anEvent + "Do I want to receive mouseMove: when the hand passes over the receiver? Rules say that by default a morph gets #mouseMove iff + * the hand is not dragging anything, + + and some button is down, + + and the receiver is the current mouse focus." + anEvent hand hasSubmorphs ifTrue: [ ^ false ]. + (anEvent anyButtonPressed and: [ anEvent hand mouseFocus == self ]) ifFalse: [ ^ false ]. + ^ true! Item was removed: - ----- Method: Morph>>isCandidateForAutomaticViewing (in category 'e-toy support') ----- - isCandidateForAutomaticViewing - ^ true! Item was changed: ----- Method: PasteUpMorph>>findAFileList: (in category 'world menu') ----- findAFileList: evt + "Bring a file list to the foreground, reusing an existing one if possible." - "Locate a file list, open it, and bring it to the front. - Create one if necessary, respecting the Preference." - self + findAWindowSatisfying: [ : aWindow | (aWindow model class = FileList) and: [ aWindow model hasUnacceptedEdits not ] ] + orMakeOneUsing: [ FileList prototypicalToolWindow openInWorld ]! - findAWindowSatisfying: [:aWindow | aWindow model isKindOf: FileList] - orMakeOneUsing: [FileList2 prototypicalToolWindow openInWorld] - ! Item was removed: - ----- Method: PasteUpMorph>>isCandidateForAutomaticViewing (in category 'e-toy support') ----- - isCandidateForAutomaticViewing - "A viewer on a world is a dangerous thing to get casually!!" - - ^ self isWorldMorph not! Item was removed: - ----- Method: SystemWindow>>isCandidateForAutomaticViewing (in category 'events') ----- - isCandidateForAutomaticViewing - ^ false! Item was changed: ----- Method: TransferMorph>>dropNotifyRecipient (in category 'accessing') ----- dropNotifyRecipient + self isThisEverCalled. ^dropNotifyRecipient! Item was changed: ----- Method: TransferMorph>>dropNotifyRecipient: (in category 'accessing') ----- dropNotifyRecipient: anObject + self isThisEverCalled. dropNotifyRecipient := anObject! Item was changed: ----- Method: TransferMorph>>result: (in category 'dropping/grabbing') ----- result: result + self isThisEverCalled. ^ self result: result from: nil! Item was changed: ----- Method: TransferMorph>>result:from: (in category 'dropping/grabbing') ----- result: aResult from: aResultGenerator + "Send aResult of the drop operation computed by aResultGenerator to a resultRecipient, if it exists." + self isThisEverCalled. - "Send aResult of the drop operation computed by aResultGenerator to a - resultRecipient, if it exists." resultRecipient ifNotNil: [resultRecipient dropResult: aResult from: aResultGenerator]!

1 0

The Trunk: Installer-Core-bf.357.mcz
by commits＠source.squeak.org 04 Jun '12

04 Jun '12

Bert Freudenberg uploaded a new version of Installer-Core to project The Trunk: http://source.squeak.org/trunk/Installer-Core-bf.357.mcz ==================== Summary ==================== Name: Installer-Core-bf.357 Author: bf Time: 4 June 2012, 6:25:40.488 pm UUID: 16e42276-de80-4d2c-aad1-9e9612ad705e Ancestors: Installer-Core-cmm.356 Make "Installer squeak" work. =============== Diff against Installer-Core-cmm.356 =============== Item was changed: ----- Method: InstallerMonticello>>http:user:password: (in category 'instance creation') ----- http: aUrl user: name password: secret + | url | + url := (aUrl includesSubString: '://') + ifTrue: [aUrl] + ifFalse: ['http://', aUrl]. + mc := self classMCHttpRepository location: url user: name password: secret. - - mc := self classMCHttpRepository location: aUrl user: name password: secret. root := mc locationWithTrailingSlash !

1 0

Easing into things...
by Frank Shearar 04 Jun '12

04 Jun '12

I just committed Tools-fbs.410 to trunk, my first ever direct commit. It's trivial - a spelling correction in Workspace's class comment. My question is this: after I commit, do I need to do anything further? Or, what happens between committing something to trunk, and an update being available? frank

4 7

Daily Commit Log
by commits＠source.squeak.org 04 Jun '12

04 Jun '12

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2012-June/005364.html Name: Installer-Core-cmm.356 Ancestors: Installer-Core-bf.355 Strengthen InstallerMantis>>#=. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-June/005365.html Name: Kernel-nice.694 Ancestors: Kernel-nice.693 Protect floorLog: 2 for case of exceptional float values (because exponent does not) Change exponent primitive fallback code to avoid a recursion with floorLog2: Note that I created a separate selector #exponentFromBitPattern for handling fallback, because it's easier to test. =============================================

1 0

The Trunk: Kernel-nice.694.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.694.mcz ==================== Summary ==================== Name: Kernel-nice.694 Author: nice Time: 3 June 2012, 5:31:52.95 pm UUID: faa4f8ea-259e-47d4-adc7-eeb195787cad Ancestors: Kernel-nice.693 Protect floorLog: 2 for case of exceptional float values (because exponent does not) Change exponent primitive fallback code to avoid a recursion with floorLog2: Note that I created a separate selector #exponentFromBitPattern for handling fallback, because it's easier to test. =============== Diff against Kernel-nice.693 =============== Item was changed: ----- Method: Float>>exponent (in category 'truncation and round off') ----- exponent "Primitive. Consider the receiver to be represented as a power of two multiplied by a mantissa (between one and two). Answer with the SmallInteger to whose power two is raised. Optional. See Object documentation whatIsAPrimitive." - | positive | <primitive: 53> + ^self exponentFromBitPattern! - self >= 1.0 ifTrue: [^self floorLog: 2]. - self > 0.0 - ifTrue: - [positive := (1.0 / self) exponent. - self = (1.0 / (1.0 timesTwoPower: positive)) - ifTrue: [^positive negated] - ifFalse: [^positive negated - 1]]. - self = 0.0 ifTrue: [^-1]. - ^self negated exponent! Item was added: + ----- Method: Float>>exponentFromBitPattern (in category 'truncation and round off') ----- + exponentFromBitPattern + "Extract the exponent from the bit pattern. + This is used only when primitive fails" + + | exponent word1 | + self isFinite ifFalse: [^self error: 'cannot take the exponent of non finite Float']. + self = 0.0 ifTrue: [^-1]. + word1 := self basicAt: 1. + exponent := (word1 bitShift: -20) bitAnd: 16r7FF. + ^exponent = 0 + ifTrue: + [| high | + high := (word1 bitAnd: 16rFFFFF) highBit. + high := high = 0 + ifTrue: [(self basicAt: 2) highBit] + ifFalse: [high + 32]. + self class emin - self class precision + high] + ifFalse: + [exponent + self class emin - 1]! Item was changed: ----- Method: Float>>floorLog: (in category 'mathematical functions') ----- floorLog: radix "Answer the floor of the log base radix of the receiver. The result may be off by one due to rounding errors, except in base 2." + (radix = 2 and: [self > 0.0 and: [self isFinite]]) ifTrue: [^self exponent]. - (radix = 2 and: [self > 0.0]) ifTrue: [^self exponent]. ^ (self log: radix) floor !

1 0

The Trunk: Installer-Core-cmm.356.mcz
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

Chris Muller uploaded a new version of Installer-Core to project The Trunk: http://source.squeak.org/trunk/Installer-Core-cmm.356.mcz ==================== Summary ==================== Name: Installer-Core-cmm.356 Author: cmm Time: 2 June 2012, 7:39:53.422 pm UUID: deb858f0-816f-4e64-bdce-d14652854ad1 Ancestors: Installer-Core-bf.355 Strengthen InstallerMantis>>#=. =============== Diff against Installer-Core-bf.355 =============== Item was changed: ----- Method: InstallerMantis>>= (in category 'accessing') ----- = other + self == other ifTrue: [ ^ true ]. + self species = other species ifFalse: [ ^ false ]. - ^ array = other array!

1 0

Daily Commit Log
by commits＠source.squeak.org 03 Jun '12

03 Jun '12

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2012-June/005359.html Name: Tools-fbs.410 Ancestors: Tools-cmm.409 Just a spelling correction: acceptDroppedMorphss -> acceptDroppedMorphs. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-June/005360.html Name: KernelTests-nice.222 Ancestors: KernelTests-nice.221 Provides tests for Fraction readFrom: ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-June/005361.html Name: Kernel-nice.692 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. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-June/005362.html Name: Kernel-nice.693 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. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-June/005363.html Name: KernelTests-nice.225 Ancestors: KernelTests-eem.224, KernelTests-nice.222 Merge nice.222 (test for reading Fraction from Stream) Complete the tests with some error conditions. =============================================

1 0

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: 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

Jump to page: