Squeak-dev March 2020

squeak-dev@lists.squeakfoundation.org

38 participants
318 discussions

The Trunk: System-nice.1139.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-nice.1139.mcz ==================== Summary ==================== Name: System-nice.1139 Author: nice Time: 3 March 2020, 11:49:13.969231 pm UUID: f83a4bb3-c9ca-4c3a-b4d1-c4e5adcefd0d Ancestors: System-mt.1138, System-nice.1128, System-ct.1133 Merge System-mt.1138, System-nice.1128, System-ct.1133 System-nice.1128: Nuke windows CE OS support. Let Win32 VM default to UTF32InputInterpreter rather than MacRomanInputInterpreter. Note: I think that this method is unused and is just adding confusion to already convoluted code... But it is difficult to analyze the source, so it's better to differ this after 5.3 release if unsure. Unless we have a good set of tests? System-ct.1133: Fix execution-around pattern to forward return value in some during methods So that Utilities useAuthorName: 'Squeak' during: [Utilities authorName] yields 'Squeak' but not Utilities. =============== Diff against System-mt.1138 =============== Item was changed: ----- Method: Locale class>>defaultInputInterpreter (in category 'platform specific') ----- defaultInputInterpreter + | platformName | - | platformName osVersion | platformName := Smalltalk platformName. + platformName = 'Win32' ifTrue: [^UTF32InputInterpreter new]. - osVersion := Smalltalk getSystemAttribute: 1002. - (platformName = 'Win32' and: [osVersion = 'CE']) - ifTrue: [^NoInputInterpreter new]. - platformName = 'Win32' ifTrue: [^MacRomanInputInterpreter new]. ^NoInputInterpreter new! Item was changed: ----- Method: Preferences class>>setFlag:toValue:during: (in category 'get/set - flags') ----- setFlag: prefSymbol toValue: aBoolean during: aBlock "Set the flag to the given value for the duration of aBlock" (self valueOfFlag: prefSymbol) in: [:previous | self setFlag: prefSymbol toValue: aBoolean. + ^ aBlock ensure: [self setFlag: prefSymbol toValue: previous]].! - aBlock ensure: [self setFlag: prefSymbol toValue: previous]].! Item was changed: ----- Method: Preferences class>>setPreference:toValue:during: (in category 'get/set') ----- setPreference: prefSymbol toValue: anObject during: aBlock (self valueOfPreference: prefSymbol) in: [:previous | self setPreference: prefSymbol toValue: anObject. + ^ aBlock ensure: [self setPreference: prefSymbol toValue: previous]]! - aBlock ensure: [self setPreference: prefSymbol toValue: previous]].! Item was changed: ----- Method: Utilities class>>useAuthorInitials:during: (in category 'identification') ----- useAuthorInitials: temporaryAuthorInitials during: aBlock | originalAuthorInitials | originalAuthorInitials := AuthorInitials. + ^[ AuthorInitials := temporaryAuthorInitials. + aBlock value ] - [ - AuthorInitials := temporaryAuthorInitials. - aBlock value ] ensure: [ AuthorInitials := originalAuthorInitials ] ! Item was changed: ----- Method: Utilities class>>useAuthorName:during: (in category 'identification') ----- useAuthorName: temporaryAuthorName during: aBlock | originalAuthorName | originalAuthorName := AuthorName. + ^[ AuthorName := temporaryAuthorName. + aBlock value ] - [ - AuthorName := temporaryAuthorName. - aBlock value ] ensure: [ AuthorName := originalAuthorName ] !

1 0

The Trunk: System-ct.1133.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-ct.1133.mcz ==================== Summary ==================== Name: System-ct.1133 Author: ct Time: 3 February 2020, 11:55:06.856675 pm UUID: bd5c789a-39d3-574b-aa2a-0f900b3a8009 Ancestors: System-cmm.1131 Fix execution-around pattern to forward return value in some during methods So that Utilities useAuthorName: 'Squeak' during: [Utilities authorName] yields 'Squeak' but not Utilities. =============== Diff against System-cmm.1131 =============== Item was changed: ----- Method: Preferences class>>setFlag:toValue:during: (in category 'get/set - flags') ----- setFlag: prefSymbol toValue: aBoolean during: aBlock "Set the flag to the given value for the duration of aBlock" (self valueOfFlag: prefSymbol) in: [:previous | self setFlag: prefSymbol toValue: aBoolean. + ^ aBlock ensure: [self setFlag: prefSymbol toValue: previous]].! - aBlock ensure: [self setFlag: prefSymbol toValue: previous]].! Item was changed: ----- Method: Preferences class>>setPreference:toValue:during: (in category 'get/set') ----- setPreference: prefSymbol toValue: anObject during: aBlock (self valueOfPreference: prefSymbol) in: [:previous | self setPreference: prefSymbol toValue: anObject. + ^ aBlock ensure: [self setPreference: prefSymbol toValue: previous]]! - aBlock ensure: [self setPreference: prefSymbol toValue: previous]].! Item was changed: ----- Method: Utilities class>>useAuthorInitials:during: (in category 'identification') ----- useAuthorInitials: temporaryAuthorInitials during: aBlock | originalAuthorInitials | originalAuthorInitials := AuthorInitials. + [ AuthorInitials := temporaryAuthorInitials. + ^ aBlock value ] - [ - AuthorInitials := temporaryAuthorInitials. - aBlock value ] ensure: [ AuthorInitials := originalAuthorInitials ] ! Item was changed: ----- Method: Utilities class>>useAuthorName:during: (in category 'identification') ----- useAuthorName: temporaryAuthorName during: aBlock | originalAuthorName | originalAuthorName := AuthorName. + [ AuthorName := temporaryAuthorName. + ^ aBlock value ] - [ - AuthorName := temporaryAuthorName. - aBlock value ] ensure: [ AuthorName := originalAuthorName ] !

1 0

The Trunk: System-nice.1128.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-nice.1128.mcz ==================== Summary ==================== Name: System-nice.1128 Author: nice Time: 9 December 2019, 6:25:31.07858 pm UUID: 8b2bd676-0898-c843-914e-039dde2db037 Ancestors: System-mt.1127 Nuke windows CE OS support. Let Win32 VM default to UTF32InputInterpreter rather than MacRomanInputInterpreter. Note: I think that this method is unused and is just adding confusion to already convoluted code... But it is difficult to analyze the source, so it's better to differ this after 5.3 release if unsure. Unless we have a good set of tests? =============== Diff against System-mt.1127 =============== Item was changed: ----- Method: Locale class>>defaultInputInterpreter (in category 'platform specific') ----- defaultInputInterpreter + | platformName | - | platformName osVersion | platformName := Smalltalk platformName. + platformName = 'Win32' ifTrue: [^UTF32InputInterpreter new]. - osVersion := Smalltalk getSystemAttribute: 1002. - (platformName = 'Win32' and: [osVersion = 'CE']) - ifTrue: [^NoInputInterpreter new]. - platformName = 'Win32' ifTrue: [^MacRomanInputInterpreter new]. ^NoInputInterpreter new!

1 0

The Trunk: Traits-pre.312.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-pre.312.mcz ==================== Summary ==================== Name: Traits-pre.312 Author: pre Time: 12 June 2019, 5:59:48.264868 pm UUID: f2ec63fa-f6e8-0347-a2c6-fb8623cb4a92 Ancestors: Traits-nice.311 This speeds up the compilation of methods in traits or in classes using traits by caching subsequent reads to the changes file. =============== Diff against Traits-nice.311 =============== Item was changed: ----- Method: ClassDescription>>updateTraits (in category '*Traits-NanoKernel') ----- updateTraits "Recompute my local traits composition" + CurrentReadOnlySourceFiles cacheDuring: [ + self installTraitsFrom: self traitComposition]! - self installTraitsFrom: self traitComposition. - ! Item was changed: ----- Method: TraitDescription>>addSelectorSilently:withMethod: (in category 'operations') ----- addSelectorSilently: selector withMethod: compiledMethod "Overridden to update the users of this trait" + CurrentReadOnlySourceFiles cacheDuring: [ + super addSelectorSilently: selector withMethod: compiledMethod. + self users do:[:each| each updateTraits]]! - super addSelectorSilently: selector withMethod: compiledMethod. - self users do:[:each| each updateTraits].!

1 0

The Trunk: Network-eem.239.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-eem.239.mcz ==================== Summary ==================== Name: Network-eem.239 Author: eem Time: 11 February 2020, 3:44:34.386439 pm UUID: 4a7fc777-149d-45ed-a205-a8ef149c84bd Ancestors: Network-tpr.238 Use withoutDuplicates for what it was intended for. Thanks to Timothy for the reminder. =============== Diff against Network-tpr.238 =============== Item was changed: ----- Method: MailMessage>>to: (in category 'accessing') ----- to: aString | sanitizedMailAddresses | + sanitizedMailAddresses := (MailAddressParser addressesIn: aString) withoutDuplicates. - sanitizedMailAddresses := (MailAddressParser addressesIn: aString) asSet asArray. ^self setField: 'to' toString: (sanitizedMailAddresses joinSeparatedBy: ', ')!

1 0

The Trunk: Kernel-nice.1307.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1307.mcz ==================== Summary ==================== Name: Kernel-nice.1307 Author: nice Time: 3 March 2020, 11:04:29.913092 pm UUID: 6c5ee38a-4234-49e4-ba8c-232f6c21167d Ancestors: Kernel-mt.1306, Kernel-ct.1295, Kernel-nice.1295, Kernel-ct.1299, Kernel-ct.1300 Merge Kernel-mt.1306, Kernel-ct.1295, Kernel-nice.1295, Kernel-ct.1299, Kernel-ct.1300 Kernel-ct.1295: Extends BlockClosure >> #whileNil: by returning the final non-nil value. Adds #whileNil analogous to #whileTrue and #whileFalse. [Project uiManager chooseFrom: #(foo bar) values: #(Foo Bar)] whileNil. [Project uiManager chooseFrom: #(foo bar) values: #(Foo Bar)] whileNil: [self inform: 'You have to decide!'] Kernel-nice.1295: Fast-up isAnExactFloat. Correct a typo in a comment. Kernel-ct.1299: Refactor #valueSupplyingAnswers:: - Don't reinvent the wheel of Exception >> #pass - Use #ifError: See also http://forum.world.st/The-Trunk-Kernel-mt-1283-mcz-td5107403.html. Kernel-ct.1300: Fix multiple typos in BlockClosure and FullBlockClosure documentation =============== Diff against Kernel-mt.1306 =============== Item was changed: ----- Method: BlockClosure>>reentrant (in category 'private') ----- reentrant "Answer a version of the recever that can be reentered. + Closures are reentrant (unlike BlockContext), so simply answer self." - Closures are reentrant (unlike BlockContect) so simply answer self." ^self! Item was changed: ----- Method: BlockClosure>>valueSupplyingAnswers: (in category 'evaluating') ----- valueSupplyingAnswers: aListOfPairs + "Evaluate the receiver using a list of questions / answers that might be called upon to automatically respond to Object>>confirm: or FillInTheBlank requests" - "evaluate the block using a list of questions / answers that might be called upon to - automatically respond to Object>>confirm: or FillInTheBlank requests" + ^ self on: ProvideAnswerNotification do: [ :notification | + | caption | + caption := notification messageText withSeparatorsCompacted. "to remove new lines" + aListOfPairs + detect: [ :each | + caption = each first + or: [ (caption includesSubstring: each first caseSensitive: false) + or: [ (each first match: caption) + or: [ (caption respondsTo: #matchesRegex:) + and: [ [caption matchesRegex: each first] ifError: [false] ] ] ] ] ] + ifFound: [ :answer | notification resume: answer second ] + ifNone: [ notification pass ] ]! - ^self - on: ProvideAnswerNotification - do: [ :notification | - | caption | - caption := notification messageText withSeparatorsCompacted. "to remove new lines" - aListOfPairs - detect: [ :each | - caption = each first - or: [ (caption includesSubstring: each first caseSensitive: false) - or: [ (each first match: caption) - or: [ (caption respondsTo: #matchesRegex:) - and: [ [caption matchesRegex: each first] on: Error do: [false] ] ] ] ] ] - ifFound: [ :answer | notification resume: answer second ] - ifNone: [ - (ProvideAnswerNotification signal: notification messageText) - ifNil: [ notification resume ] - ifNotNil: [ :outerAnswer | notification resume: outerAnswer ] ] ]! Item was added: + ----- Method: BlockClosure>>whileNil (in category 'controlling') ----- + whileNil + "Unlike #whileTrue/False this is not compiled inline." + | result | + [(result := self value) isNil] whileTrue. + ^ result + ! Item was changed: ----- Method: BlockClosure>>whileNil: (in category 'controlling') ----- whileNil: aBlock "Unlike #whileTrue/False: this is not compiled inline." + | result | + [(result := self value) isNil] whileTrue: [aBlock value]. + ^ result - ^ [self value isNil] whileTrue: [aBlock value] ! Item was changed: BlockClosure variableSubclass: #FullBlockClosure instanceVariableNames: 'receiver' classVariableNames: '' poolDictionaries: '' category: 'Kernel-Methods'! + !FullBlockClosure commentStamp: 'ct 2/14/2020 15:56' prior: 0! + Instances of FullBlockClosure represent blocks, a sequence of statements inside square brackets that can be evaluated at any time via one of the value messages (value, value:, value:value:, ..., valueWithArguments:), which answer their last statement. Blocks therefore allow deferred evaluation and so are used to build control structures where a sequence of statements are evaluated or not depending on other values in the program. - !FullBlockClosure commentStamp: 'eem 4/10/2017 11:18' prior: 0! - Instances of FullBlockClosure represent blocks, a sequence of statements inside square brackets that can be evaluated at any time via one of the value messages (value, value:, value:value:, ... valueWithArguments:), which answer their last statement. Blocks therefore allow deferred evaluation and so are used to buikld control structures where a sequence of statements are evaluated or not depending on other values in the program. FullBlockClosure is a refinement of BlockClosure that allows the block to use its own method to hold its code instead of embedding that code within its home method. + Implementation notes: - Implementation: A FullBlockClosure is a closure that can be independent of any outerContext if desired. It has its own method (currently reusing the startpc inst var) and its own receiver. outerContext can be either a Context or nil. + This closure design, implemented by Eliot Miranda and Clement Bera along with the sista work, aims to simplify the block closure model while enhacing its capabilities. It allows lazy decompilation of closures and fast machine code dispatch in Cog's JIT, while allowing inlining of methods and blocks to be independent from their enclosing blocks. - This closure design, implemented by Eliot Miranda and Clement Bera along with the sista work aims to simplify the block closure model while enhacing its capabilities. It allows lazy decompilation of closures and fast machine code dispatch in Cog's JIT, while allowing inlining of methods and blocks to be independent from their enclosing blocks. At closure creation time, the bytecode specifies: - the compiledBlock to execute when executing this block's code (in the literal frame) - if the receiver is the current receiver or a receiver passed on stack before the copied values. - if the closure needs an outerContext. outerContexts are used for non local returns and debugging. Blocks with non local returns have to set their outerContext. For other blocks (97% of blocks), it's a trade-off between performance and debuggability. Instance Variables (inherited) numArgs <SmallInteger> outerContext: <Context|nil> compiledBlock(startpc) <CompiledBlock> Instance Variables receiver: <Object> numArgs - the number of arguments the block expects. This is superfluous; the number of arguments can be obtained from the receiver's compiledBlock. outerContext - the Context of the method or block activation in which the receiver is created. compiledBlock(startpc) - reused to refer to the CompiledBlock that implements the receiver's code. receiver - the receiver of the message that created the block's home method activation.! Item was changed: ----- Method: Integer>>isAnExactFloat (in category 'testing') ----- isAnExactFloat "Answer true if this Integer can be converted exactly to a Float" | h | (h := self highBitOfMagnitude) <= Float precision ifTrue: [^ true]. ^ h - 1 <= Float emax + and: [(self anyBitOfMagnitudeFrom: 1 to: h - Float precision) not]! - and: [h - self abs lowBit < Float precision]! Item was changed: ----- Method: NumberParser>>makeFloatFromMantissa:exponent:base: (in category 'parsing-private') ----- makeFloatFromMantissa: m exponent: k base: aRadix + "Convert infinite precision arithmetic into limited precision Floating point. + This algorithm rely on correct IEEE rounding mode - "Convert infinite precision arithmetic into Floating point. - This alogrithm rely on correct IEEE rounding mode being implemented in Integer>>asFloat and Fraction>>asFloat" k = 0 ifTrue: [ ^m asFloat ]. k > 0 ifTrue: [ ^(m * (aRadix raisedToInteger: k)) asFloat ]. ^(Fraction numerator: m denominator: (aRadix raisedToInteger: k negated)) asFloat!

1 0

The Trunk: Kernel-ct.1300.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ct.1300.mcz ==================== Summary ==================== Name: Kernel-ct.1300 Author: ct Time: 16 February 2020, 4:53:53.7 pm UUID: f7fb9fc4-63e9-2c41-b97a-6928d5d0d08b Ancestors: Kernel-tonyg.1293 Fix multiple typos in BlockClosure and FullBlockClosure documentation =============== Diff against Kernel-tonyg.1293 =============== Item was changed: ----- Method: BlockClosure>>reentrant (in category 'private') ----- reentrant "Answer a version of the recever that can be reentered. + Closures are reentrant (unlike BlockContext), so simply answer self." - Closures are reentrant (unlike BlockContect) so simply answer self." ^self! Item was changed: BlockClosure variableSubclass: #FullBlockClosure instanceVariableNames: 'receiver' classVariableNames: '' poolDictionaries: '' category: 'Kernel-Methods'! + !FullBlockClosure commentStamp: 'ct 2/14/2020 15:56' prior: 0! + Instances of FullBlockClosure represent blocks, a sequence of statements inside square brackets that can be evaluated at any time via one of the value messages (value, value:, value:value:, ..., valueWithArguments:), which answer their last statement. Blocks therefore allow deferred evaluation and so are used to build control structures where a sequence of statements are evaluated or not depending on other values in the program. - !FullBlockClosure commentStamp: 'eem 4/10/2017 11:18' prior: 0! - Instances of FullBlockClosure represent blocks, a sequence of statements inside square brackets that can be evaluated at any time via one of the value messages (value, value:, value:value:, ... valueWithArguments:), which answer their last statement. Blocks therefore allow deferred evaluation and so are used to buikld control structures where a sequence of statements are evaluated or not depending on other values in the program. FullBlockClosure is a refinement of BlockClosure that allows the block to use its own method to hold its code instead of embedding that code within its home method. + Implementation notes: - Implementation: A FullBlockClosure is a closure that can be independent of any outerContext if desired. It has its own method (currently reusing the startpc inst var) and its own receiver. outerContext can be either a Context or nil. + This closure design, implemented by Eliot Miranda and Clement Bera along with the sista work, aims to simplify the block closure model while enhacing its capabilities. It allows lazy decompilation of closures and fast machine code dispatch in Cog's JIT, while allowing inlining of methods and blocks to be independent from their enclosing blocks. - This closure design, implemented by Eliot Miranda and Clement Bera along with the sista work aims to simplify the block closure model while enhacing its capabilities. It allows lazy decompilation of closures and fast machine code dispatch in Cog's JIT, while allowing inlining of methods and blocks to be independent from their enclosing blocks. At closure creation time, the bytecode specifies: - the compiledBlock to execute when executing this block's code (in the literal frame) - if the receiver is the current receiver or a receiver passed on stack before the copied values. - if the closure needs an outerContext. outerContexts are used for non local returns and debugging. Blocks with non local returns have to set their outerContext. For other blocks (97% of blocks), it's a trade-off between performance and debuggability. Instance Variables (inherited) numArgs <SmallInteger> outerContext: <Context|nil> compiledBlock(startpc) <CompiledBlock> Instance Variables receiver: <Object> numArgs - the number of arguments the block expects. This is superfluous; the number of arguments can be obtained from the receiver's compiledBlock. outerContext - the Context of the method or block activation in which the receiver is created. compiledBlock(startpc) - reused to refer to the CompiledBlock that implements the receiver's code. receiver - the receiver of the message that created the block's home method activation.!

1 0

The Trunk: Kernel-ct.1299.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ct.1299.mcz ==================== Summary ==================== Name: Kernel-ct.1299 Author: ct Time: 16 February 2020, 4:26:42.224 pm UUID: b1c9f40a-a7ea-9a4e-a502-268cb22592e7 Ancestors: Kernel-tonyg.1293 Refactor #valueSupplyingAnswers:: - Don't reinvent the wheel of Exception >> #pass - Use #ifError: See also http://forum.world.st/The-Trunk-Kernel-mt-1283-mcz-td5107403.html. =============== Diff against Kernel-tonyg.1293 =============== Item was changed: ----- Method: BlockClosure>>valueSupplyingAnswers: (in category 'evaluating') ----- valueSupplyingAnswers: aListOfPairs + "Evaluate the receiver using a list of questions / answers that might be called upon to automatically respond to Object>>confirm: or FillInTheBlank requests" - "evaluate the block using a list of questions / answers that might be called upon to - automatically respond to Object>>confirm: or FillInTheBlank requests" + ^ self on: ProvideAnswerNotification do: [ :notification | + | caption | + caption := notification messageText withSeparatorsCompacted. "to remove new lines" + aListOfPairs + detect: [ :each | + caption = each first + or: [ (caption includesSubstring: each first caseSensitive: false) + or: [ (each first match: caption) + or: [ (caption respondsTo: #matchesRegex:) + and: [ [caption matchesRegex: each first] ifError: [false] ] ] ] ] ] + ifFound: [ :answer | notification resume: answer second ] + ifNone: [ notification pass ] ]! - ^self - on: ProvideAnswerNotification - do: [ :notification | - | caption | - caption := notification messageText withSeparatorsCompacted. "to remove new lines" - aListOfPairs - detect: [ :each | - caption = each first - or: [ (caption includesSubstring: each first caseSensitive: false) - or: [ (each first match: caption) - or: [ (caption respondsTo: #matchesRegex:) - and: [ [caption matchesRegex: each first] on: Error do: [false] ] ] ] ] ] - ifFound: [ :answer | notification resume: answer second ] - ifNone: [ - (ProvideAnswerNotification signal: notification messageText) - ifNil: [ notification resume ] - ifNotNil: [ :outerAnswer | notification resume: outerAnswer ] ] ]!

1 0

The Trunk: Kernel-nice.1295.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1295.mcz ==================== Summary ==================== Name: Kernel-nice.1295 Author: nice Time: 17 February 2020, 6:59:12.589583 pm UUID: 7b8c61b2-fd1d-473e-9536-57f78a6ec152 Ancestors: Kernel-tonyg.1293 Fast-up isAnExactFloat. Correct a typo in a comment. =============== Diff against Kernel-tonyg.1293 =============== Item was changed: ----- Method: Integer>>isAnExactFloat (in category 'testing') ----- isAnExactFloat "Answer true if this Integer can be converted exactly to a Float" | h | (h := self highBitOfMagnitude) <= Float precision ifTrue: [^ true]. ^ h - 1 <= Float emax + and: [(self anyBitOfMagnitudeFrom: 1 to: h - Float precision) not]! - and: [h - self abs lowBit < Float precision]! Item was changed: ----- Method: NumberParser>>makeFloatFromMantissa:exponent:base: (in category 'parsing-private') ----- makeFloatFromMantissa: m exponent: k base: aRadix + "Convert infinite precision arithmetic into limited precision Floating point. + This algorithm rely on correct IEEE rounding mode - "Convert infinite precision arithmetic into Floating point. - This alogrithm rely on correct IEEE rounding mode being implemented in Integer>>asFloat and Fraction>>asFloat" k = 0 ifTrue: [ ^m asFloat ]. k > 0 ifTrue: [ ^(m * (aRadix raisedToInteger: k)) asFloat ]. ^(Fraction numerator: m denominator: (aRadix raisedToInteger: k negated)) asFloat!

1 0

The Trunk: Morphic-nice.1632.mcz
by commits＠source.squeak.org 03 Mar '20

03 Mar '20

Nicolas Cellier uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-nice.1632.mcz ==================== Summary ==================== Name: Morphic-nice.1632 Author: nice Time: 3 March 2020, 10:24:06.755329 pm UUID: dda12d07-80d5-4d83-b676-75c40f56a5fd Ancestors: Morphic-mt.1631, Morphic-nice.1625 Merge Morphic-nice.1625 Free our mind from un-initialized LayoutFrame. There should not be any such thing. Require Graphics-nice.427 =============== Diff against Morphic-mt.1631 =============== Item was changed: ----- Method: BorderedMorph>>addMorph:fullFrame: (in category 'resize handling') ----- addMorph: aMorph fullFrame: aLayoutFrame "Add aMorph according to aLayoutFrame." self cellGap > 0 ifTrue: [ | left right bottom top spacing | spacing := self cellGap. + left := aLayoutFrame leftOffset. + right := aLayoutFrame rightOffset. - left := aLayoutFrame leftOffset ifNil: [0]. - right := aLayoutFrame rightOffset ifNil: [0]. + bottom := aLayoutFrame bottomOffset. + top := aLayoutFrame topOffset. - bottom := aLayoutFrame bottomOffset ifNil: [0]. - top := aLayoutFrame topOffset ifNil: [0]. "Add a spacing to the frame if it is not top or leftmost." aLayoutFrame leftFraction = 0 ifFalse: [left := left + spacing] ifTrue: [ "Expect another, resizable widget besides me if I have a fixed width." aLayoutFrame hasFixedWidth ifTrue: [right := right - spacing]]. aLayoutFrame topFraction = 0 ifFalse: [top := top + spacing] ifTrue: [ "Expect another, resizable widget besides me if I have a fixed height." aLayoutFrame hasFixedHeight ifTrue: [bottom := bottom - spacing]]. aLayoutFrame topOffset: top; bottomOffset: bottom; leftOffset: left; rightOffset: right]. super addMorph: aMorph fullFrame: aLayoutFrame. self wantsPaneSplitters ifTrue: [self addPaneSplitters].! Item was changed: ----- Method: BorderedMorph>>addPaneHSplitterAtBottomOfRow: (in category 'resize handling') ----- addPaneHSplitterAtBottomOfRow: someMorphs | targetY minX maxX splitter | targetY := someMorphs first layoutFrame bottomFraction. minX := (someMorphs detectMin: [:each | each layoutFrame leftFraction]) layoutFrame leftFraction. maxX := (someMorphs detectMax: [:each | each layoutFrame rightFraction]) layoutFrame rightFraction. splitter := ProportionalSplitterMorph new beSplitsTopAndBottom; yourself. splitter layoutFrame: (LayoutFrame fractions: (minX @ targetY corner: maxX @ targetY) + offsets: (someMorphs first layoutFrame leftOffset @ 0 + corner: someMorphs first layoutFrame rightOffset @ AbstractResizerMorph gripThickness)). - offsets: ((someMorphs first layoutFrame leftOffset ifNil: [0]) @ 0 - corner: (someMorphs first layoutFrame rightOffset ifNil: [0]) @ AbstractResizerMorph gripThickness)). self addMorphBack: (splitter position: self position).! Item was changed: ----- Method: BorderedMorph>>addPaneVSplitterAtRightOfColumn: (in category 'resize handling') ----- addPaneVSplitterAtRightOfColumn: someMorphs | targetX minY maxY splitter | targetX := someMorphs first layoutFrame rightFraction. minY := (someMorphs detectMin: [:each | each layoutFrame topFraction]) layoutFrame topFraction. maxY := (someMorphs detectMax: [:each | each layoutFrame bottomFraction]) layoutFrame bottomFraction. splitter := ProportionalSplitterMorph new beSplitsLeftAndRight; yourself. splitter layoutFrame: (LayoutFrame fractions: (targetX @ minY corner: targetX @ maxY) + offsets: (0 @ (someMorphs first layoutFrame topOffset) + corner: (AbstractResizerMorph gripThickness@ (someMorphs first layoutFrame bottomOffset)))). - offsets: (0 @ (someMorphs first layoutFrame topOffset ifNil: [0]) - corner: (AbstractResizerMorph gripThickness@ (someMorphs first layoutFrame bottomOffset ifNil: [0])))). self addMorphBack: (splitter position: self position).! Item was changed: ----- Method: BorderedMorph>>linkSubmorphsToSplitters (in category 'resize handling') ----- linkSubmorphsToSplitters self splitters do: [:splitter | splitter splitsTopAndBottom ifTrue: [ self submorphsDo: [:morph | ((morph ~= splitter and: [morph layoutFrame bottomFraction = splitter layoutFrame topFraction]) and: [morph layoutFrame hasFixedHeight not + or: [(morph layoutFrame topOffset) < 0]]) - or: [(morph layoutFrame topOffset ifNil: [0]) < 0]]) ifTrue: [splitter addLeftOrTop: morph]. ((morph ~= splitter and: [morph layoutFrame topFraction = splitter layoutFrame bottomFraction]) and: [morph layoutFrame hasFixedHeight not + or: [(morph layoutFrame bottomOffset) > 0]]) - or: [(morph layoutFrame bottomOffset ifNil: [0]) > 0]]) ifTrue: [splitter addRightOrBottom: morph]]]. splitter splitsLeftAndRight ifTrue: [ self submorphsDo: [:morph | ((morph ~= splitter and: [morph layoutFrame rightFraction = splitter layoutFrame leftFraction]) and: [morph layoutFrame hasFixedWidth not + or: [(morph layoutFrame leftOffset) < 0]]) - or: [(morph layoutFrame leftOffset ifNil: [0]) < 0]]) ifTrue: [splitter addLeftOrTop: morph]. ((morph ~= splitter and: [morph layoutFrame leftFraction = splitter layoutFrame rightFraction]) and: [morph layoutFrame hasFixedWidth not + or: [(morph layoutFrame rightOffset) > 0]]) - or: [(morph layoutFrame rightOffset ifNil: [0]) > 0]]) ifTrue: [splitter addRightOrBottom: morph]]]]! Item was changed: ----- Method: ProportionalSplitterMorph>>balanceOffsets (in category 'events') ----- balanceOffsets | fdx fdy | (self hasProperty: #fullDelta) ifFalse: [^ self]. fdx := (self valueOfProperty: #fullDelta) x. fdy := (self valueOfProperty: #fullDelta) y. self layoutFrame hasFixedHeight ifTrue: [ | otop obot ctop cbot topf | otop := (owner submorphs detect: [:m | m layoutFrame topFraction isZero] ifNone: [^ self]) in: [:tm | + tm top - (tm layoutFrame topOffset)]. - tm top - (tm layoutFrame topOffset ifNil: [0])]. obot := (owner submorphs detect: [:m | m layoutFrame bottomFraction = 1] ifNone: [^ self]) in: [:tm | + tm bottom - (tm layoutFrame bottomOffset)]. - tm bottom - (tm layoutFrame bottomOffset ifNil: [0])]. ctop := (self layoutFrame topFraction * (obot - otop)) rounded + + otop + (self layoutFrame topOffset). - + otop + (self layoutFrame topOffset ifNil: [0]). cbot := (self layoutFrame bottomFraction * (obot - otop)) rounded + + otop + (self layoutFrame bottomOffset). - + otop + (self layoutFrame bottomOffset ifNil: [0]). topf := self layoutFrame topFraction. self layoutFrame topFraction: ((ctop + cbot) * 0.5 - otop) / (obot - otop) asFloat. self layoutFrame bottomFraction: self layoutFrame topFraction. self layoutFrame topOffset: self layoutFrame topOffset - fdy. self layoutFrame bottomOffset: self layoutFrame bottomOffset - fdy. (leftOrTop copy union: rightOrBottom) do: [:m | (m layoutFrame topFraction closeTo: topf) ifTrue: [ m layoutFrame topFraction: self layoutFrame topFraction. m layoutFrame topOffset: m layoutFrame topOffset - fdy]. (m layoutFrame bottomFraction closeTo: topf) ifTrue: [ m layoutFrame bottomFraction: self layoutFrame topFraction. m layoutFrame bottomOffset: m layoutFrame bottomOffset - fdy]]] . self layoutFrame hasFixedWidth ifTrue: [ | oleft oright cleft cright leftf | oleft := (owner submorphs detect: [:m | m layoutFrame leftFraction isZero] ifNone: [^ self]) in: [:tm | + tm left - (tm layoutFrame leftOffset)]. - tm left - (tm layoutFrame leftOffset ifNil: [0])]. oright := (owner submorphs detect: [:m | m layoutFrame rightFraction = 1] ifNone: [^ self]) in: [:tm | + tm right - (tm layoutFrame rightOffset)]. - tm right - (tm layoutFrame rightOffset ifNil: [0])]. cleft := (self layoutFrame leftFraction * (oright - oleft)) rounded + + oleft + (self layoutFrame leftOffset). - + oleft + (self layoutFrame leftOffset ifNil: [0]). cright := (self layoutFrame rightFraction * (oright - oleft)) rounded + + oleft + (self layoutFrame rightOffset). - + oleft + (self layoutFrame rightOffset ifNil: [0]). leftf := self layoutFrame leftFraction. self layoutFrame leftFraction: ((cleft + cright) * 0.5 - oleft) / (oright - oleft) asFloat. self layoutFrame rightFraction: self layoutFrame leftFraction. self layoutFrame leftOffset: self layoutFrame leftOffset - fdx. self layoutFrame rightOffset: self layoutFrame rightOffset - fdx. (leftOrTop copy union: rightOrBottom) do: [:m | (m layoutFrame leftFraction closeTo: leftf) ifTrue: [ m layoutFrame leftFraction: self layoutFrame leftFraction. m layoutFrame leftOffset: m layoutFrame leftOffset - fdx]. (m layoutFrame rightFraction closeTo: leftf) ifTrue: [ m layoutFrame rightFraction: self layoutFrame leftFraction. m layoutFrame rightOffset: m layoutFrame rightOffset - fdx.]]] . self removeProperty: #fullDelta. owner layoutChanged ! Item was changed: ----- Method: ProportionalSplitterMorph>>repositionBy: (in category 'events') ----- repositionBy: delta | selfTop selfBottom selfLeft selfRight | self setProperty: #fullDelta toValue: ((self valueOfProperty: #fullDelta) ifNil: [0@0]) + delta. leftOrTop do: [ : each | | firstRight firstBottom firstLeft firstTop | + firstRight := each layoutFrame rightOffset. + firstBottom := each layoutFrame bottomOffset. - firstRight := each layoutFrame rightOffset ifNil: [ 0 ]. - firstBottom := each layoutFrame bottomOffset ifNil: [ 0 ]. each layoutFrame rightOffset: firstRight + delta x. each layoutFrame bottomOffset: firstBottom + delta y. each layoutFrame hasFixedHeight ifTrue: [ + firstTop := each layoutFrame topOffset. - firstTop := each layoutFrame topOffset ifNil: [ 0 ]. each layoutFrame topOffset: firstTop + delta y ]. each layoutFrame hasFixedWidth ifTrue: [ + firstLeft := each layoutFrame leftOffset. - firstLeft := each layoutFrame leftOffset ifNil: [ 0 ]. each layoutFrame leftOffset: firstLeft + delta x. ] ]. rightOrBottom do: [ : each | | secondLeft secondTop secondRight secondBottom | + secondLeft := each layoutFrame leftOffset. + secondTop := each layoutFrame topOffset. - secondLeft := each layoutFrame leftOffset ifNil: [ 0 ]. - secondTop := each layoutFrame topOffset ifNil: [ 0 ]. each layoutFrame leftOffset: secondLeft + delta x. each layoutFrame topOffset: secondTop + delta y. each layoutFrame hasFixedHeight ifTrue: [ + secondBottom := each layoutFrame bottomOffset. - secondBottom := each layoutFrame bottomOffset ifNil: [ 0 ]. each layoutFrame bottomOffset: secondBottom + delta y. ]. each layoutFrame hasFixedWidth ifTrue: [ + secondRight := each layoutFrame rightOffset. - secondRight := each layoutFrame rightOffset ifNil: [ 0 ]. each layoutFrame rightOffset: secondRight + delta x. ] ]. + selfTop := self layoutFrame topOffset. + selfBottom := self layoutFrame bottomOffset. + selfLeft := self layoutFrame leftOffset. + selfRight := self layoutFrame rightOffset. - selfTop := self layoutFrame topOffset ifNil: [ 0 ]. - selfBottom := self layoutFrame bottomOffset ifNil: [ 0 ]. - selfLeft := self layoutFrame leftOffset ifNil: [ 0 ]. - selfRight := self layoutFrame rightOffset ifNil: [ 0 ]. self layoutFrame topOffset: selfTop + delta y ; bottomOffset: selfBottom + delta y ; leftOffset: selfLeft + delta x ; rightOffset: selfRight + delta x. self owner layoutChanged. self movements removeFirst; add: (splitsTopAndBottom ifTrue: [ delta y sign ] ifFalse: [ delta x sign ])! Item was changed: ----- Method: SystemWindow>>convertAlignment (in category 'layout') ----- convertAlignment "Primarily Jesse Welton's code to convert old system windows to ones with modern layout scheme" self layoutPolicy: ProportionalLayout new. (paneMorphs isNil or: [paneRects isNil or: [paneMorphs size ~= paneRects size]]) ifFalse: [self addLabelArea. self putLabelItemsInLabelArea. self setFramesForLabelArea. paneMorphs with: paneRects do: [:m :r | | frame | frame := LayoutFrame new. frame leftFraction: r left; rightFraction: r right; topFraction: r top; bottomFraction: r bottom. m layoutFrame: frame. m hResizing: #spaceFill; vResizing: #spaceFill]]. labelArea isNil ifTrue: [self addLabelArea. self putLabelItemsInLabelArea. self setFramesForLabelArea. paneMorphs ifNotNil: [paneMorphs do: [:m | | frame | frame := m layoutFrame ifNil: [LayoutFrame new]. + frame topOffset: (frame topOffset) - self labelHeight. - frame topOffset: (frame topOffset ifNil: [0]) - self labelHeight. frame bottomFraction ~= 1.0 ifTrue: + [frame bottomOffset: (frame bottomOffset) - self labelHeight]]]]. - [frame bottomOffset: (frame bottomOffset ifNil: [0]) - self labelHeight]]]]. label ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0.5; topFraction: 0; leftOffset: label width negated // 2. label layoutFrame: frame]. collapseBox ifNotNil: [| frame | frame := LayoutFrame new. frame rightFraction: 1; topFraction: 0; rightOffset: -1; topOffset: 1. collapseBox layoutFrame: frame]. stripes ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0; topFraction: 0; rightFraction: 1; leftOffset: 1; topOffset: 1; rightOffset: -1. stripes first layoutFrame: frame. stripes first height: self labelHeight - 2. stripes first hResizing: #spaceFill. frame := LayoutFrame new. frame leftFraction: 0; topFraction: 0; rightFraction: 1; leftOffset: 3; topOffset: 3; rightOffset: -3. stripes last layoutFrame: frame. stripes last height: self labelHeight - 6. stripes last hResizing: #spaceFill]. menuBox ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0; leftOffset: 19; topFraction: 0; topOffset: 1. menuBox layoutFrame: frame]. closeBox ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0; leftOffset: 4; topFraction: 0; topOffset: 1. closeBox layoutFrame: frame]! Item was changed: ----- Method: SystemWindow>>setPaneRectsFromBounds (in category 'geometry') ----- setPaneRectsFromBounds "Reset proportional specs from actual bounds, eg, after reframing panes" | layoutBounds | layoutBounds := self layoutBounds. paneMorphs do:[:m| | box left bottom top frame right | frame := m layoutFrame. box := m bounds. frame ifNotNil:[ + left := box left - layoutBounds left - frame leftOffset. + right := box right - layoutBounds left - frame rightOffset. + top := box top - layoutBounds top - frame topOffset. + bottom := box bottom - layoutBounds top - frame bottomOffset. - left := box left - layoutBounds left - (frame leftOffset ifNil:[0]). - right := box right - layoutBounds left - (frame rightOffset ifNil:[0]). - top := box top - layoutBounds top - (frame topOffset ifNil:[0]). - bottom := box bottom - layoutBounds top - (frame bottomOffset ifNil:[0]). frame leftFraction: (left / layoutBounds width asFloat). frame rightFraction: (right / layoutBounds width asFloat). frame topFraction: (top / layoutBounds height asFloat). frame bottomFraction: (bottom / layoutBounds height asFloat). ]. ].!

1 0

Jump to page: