Packages September 2019

packages@lists.squeakfoundation.org

1 participants
182 discussions

The Trunk: WebClient-Core-nice.119.mcz
by commits＠source.squeak.org 12 Sep '19

12 Sep '19

Nicolas Cellier uploaded a new version of WebClient-Core to project The Trunk: http://source.squeak.org/trunk/WebClient-Core-nice.119.mcz ==================== Summary ==================== Name: WebClient-Core-nice.119 Author: nice Time: 12 September 2019, 12:55:52.391336 am UUID: 7a017a9c-1a85-4a4e-bbfb-63ed34c747e9 Ancestors: WebClient-Core-topa.118 Fix a bunch of serious bugs in json number decoding Implementation will now answer the nearest Float, what it failed to previously. =============== Diff against WebClient-Core-topa.118 =============== Item was added: + ----- Method: WebUtils class>>jsonFloatSignificand:exp10: (in category 'json-decode') ----- + jsonFloatSignificand: value exp10: exponent + "Take care to convert to nearest Float" + ^self jsonFloatSignificand: value exp10: exponent scale: (10 raisedTo: exponent abs)! Item was added: + ----- Method: WebUtils class>>jsonFloatSignificand:exp10:scale: (in category 'json-decode') ----- + jsonFloatSignificand: value exp10: exponent scale: scale + "Take care to convert to nearest Float" + "self assert: scale = (10 raisedTo: exponent abs)." + ^(value isAnExactFloat and: ["scale isAnExactFloat" + exponent between: -22 and: 22 + "(1 to: 100) detect: [:i | (10 raisedTo: i) isAnExactFloat not]"]) + ifTrue: [exponent >= 0 + ifTrue: [value asExactFloat * scale asExactFloat] + ifFalse: [value asExactFloat / scale asExactFloat]] + ifFalse: [exponent >= 0 + ifTrue: [(value * scale) asFloat] + ifFalse: [(Fraction numerator: value denominator: scale) asFloat]]! Item was changed: ----- Method: WebUtils class>>jsonNumberFrom: (in category 'json-decode') ----- jsonNumberFrom: stream "Decodes a JSON number from the stream" + | ascii ch integer fraction scale sign expSign exponent exp value beFloat | + integer := fraction := exponent := exp := 0. sign := scale := expSign := 1. - | ascii integer fraction scale sign expSign exponent value ch | - integer := fraction := 0. sign := scale := exponent := expSign := 1. ascii := stream next asciiValue. ascii = 45 "$- asciiValue" ifTrue:[ sign := -1. ascii := stream next asciiValue. ]. "JSON requires at least one digit" (ascii >= 48 and:[ascii <= 57]) ifFalse:[^self error: 'Digit expected']. "Read the integer part" integer := ascii - 48. [ch := stream next ifNil:[^integer * sign]. ascii := ch asciiValue. ascii >= 48 and:[ascii <= 57]] whileTrue:[ integer := (integer * 10) + (ascii - 48). ]. + (beFloat := ascii = 46) "$. asciiValue" ifTrue:[ - ascii = 46 "$. asciiValue" ifTrue:[ "Read the fraction part" + [ch := stream next ifNil: + [value := integer * scale + fraction * sign. + ^self jsonFloatSignificand: value exp10: exponent scale: scale]. - [ch := stream next ifNil:[^(integer * scale + fraction * sign) asFloat / scale]. ascii := ch asciiValue. ascii >= 48 and:[ascii <= 57]] whileTrue:[ fraction := (fraction * 10) + (ascii - 48). + exponent := exponent - 1. scale := scale * 10. ]. + value := integer * scale + fraction * sign. - value := (integer * scale + fraction * sign) asFloat / scale asFloat. ] ifFalse:[value := integer * sign]. - (ascii = 69 "$E asciiValue" or:[ascii = 101 "$e asciiValue"]) ifTrue:[ "Read exponent" ascii := stream next asciiValue. + ascii = 45 "$- asciiValue" ifTrue:[ - ascii = $- ifTrue:[ expSign := -1. ascii := stream next asciiValue. + ] ifFalse:[ascii = 43 "$+ asciiValue" ifTrue:[ascii := stream next asciiValue]]. + exp := ascii - 48. + [ch := stream next ifNil: + [exponent := exp * expSign + exponent. + (beFloat or: [expSign = -1]) ifTrue: [^self jsonFloatSignificand: value exp10: exponent]. + ^value * (10 raisedTo: exponent)]. - ] ifFalse:[ascii = $+ ifTrue:[ascii := stream next asciiValue]]. - exponent := ascii - 48. - [ch := stream next ifNil:[^value * (10 raisedTo: expSign * exponent)]. ascii := ch asciiValue. ascii >= 48 and:[ascii <= 57]] whileTrue:[ + exp := (exp * 10) + (ascii - 48). - exponent := (exponent * 10) + (ascii - 48). ]. + exponent := exp * expSign + exponent - exponent := exponent * expSign. ]. "Skip back before last character since number might be part of a sequence like 1, 2, 3, 4, etc (which would eat the trailing comma)" ch isAlphaNumeric ifTrue:[^self error: 'Delimiter expected']. stream skip: -1. + (beFloat or: [expSign = -1]) ifTrue: [^self jsonFloatSignificand: value exp10: exponent]. + ^value * (10 raisedTo: exponent)! - exponent = 1 ifFalse:[ - exponent < 0 ifTrue:[value := value asFloat]. - value := value * (10 raisedTo: exponent). - ]. - ^value!

1 0

The Trunk: KernelTests-nice.371.mcz
by commits＠source.squeak.org 12 Sep '19

12 Sep '19

Nicolas Cellier uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-nice.371.mcz ==================== Summary ==================== Name: KernelTests-nice.371 Author: nice Time: 12 September 2019, 12:40:06.373387 am UUID: d7755239-e282-46b3-9a72-c91b4d386e70 Ancestors: KernelTests-nice.370 Add a testLargeNegativeIntegerAsFloat asFloat shall preserve the sign I made a mistake that went unnoticed due to lack of such test! =============== Diff against KernelTests-nice.370 =============== Item was added: + ----- Method: FloatTest>>testLargeNegativeIntegerAsFloat (in category 'tests - conversion') ----- + testLargeNegativeIntegerAsFloat + "assert IEEE 754 round to nearest even mode is honoured" + + self assert: SmallInteger minVal asFloat negative. + self assert: SmallInteger minVal isAnExactFloat description: 'this test requires this condition. If not met, change the test'. + self assert: SmallInteger minVal equals: SmallInteger minVal asFloat. "this test requires integrity of negative SmallInteger asFloat" + self assert: SmallInteger minVal asFloat - 1.0 equals: (SmallInteger minVal - 1) asFloat "same for LargeNegativeInteger" + !

1 0

The Trunk: SUnit-mt.118.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of SUnit to project The Trunk: http://source.squeak.org/trunk/SUnit-mt.118.mcz ==================== Summary ==================== Name: SUnit-mt.118 Author: mt Time: 9 September 2019, 3:30:50.56487 pm UUID: db2ce542-93c4-47ff-b855-726d56f4cdee Ancestors: SUnit-mt.117 Partially revert time measurement for tests to make smalltalkCI-dependent projects build against Trunk again. Still investigating a solution for that. :-) =============== Diff against SUnit-mt.117 =============== Item was changed: ----- Method: TestCase>>run: (in category 'running') ----- run: aResult + aResult runCase: self. - aResult runCaseMeasured: self. !

1 0

The Trunk: Morphic-mt.1517.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1517.mcz ==================== Summary ==================== Name: Morphic-mt.1517 Author: mt Time: 9 September 2019, 10:44:10.260698 am UUID: 58b37267-f538-1746-a803-c96d6689ee91 Ancestors: Morphic-mt.1516 Fixes regression in StringMorph. Updates post-load script to fix all existing instances. Makes switching to UI-Themes with different fonts work again. =============== Diff against Morphic-mt.1516 =============== Item was changed: ----- Method: StringMorph>>font:emphasis: (in category 'accessing - convenience') ----- font: aFont emphasis: emphasisCode self setFont: ((aFont isNil or: [aFont emphasis = emphasisCode] or: [emphasisCode isNil]) ifTrue: [aFont] ifFalse: [aFont emphasized: emphasisCode]) + emphasis: (emphasisCode ifNil: [aFont emphasis]).! - emphasis: emphasisCode.! Item was changed: + (PackageInfo named: 'Morphic') postscript: 'SystemNavigation cleanUp: true. + Editor withAllSubclasses do: #initialize. + + "Update emphasis cache in all existing string morphs." + StringMorph allSubInstancesDo: [:m | + m emphasis ifNil: [ + m emphasis: (m font ifNil: [0] ifNotNil: [:f | f emphasis])]].'! - (PackageInfo named: 'Morphic') postscript: '"Reset contributors." - SystemNavigation cleanUp: true. - Editor withAllSubclasses do: #initialize.'!

1 0

The Trunk: CollectionsTests-mt.315.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-mt.315.mcz ==================== Summary ==================== Name: CollectionsTests-mt.315 Author: mt Time: 19 August 2019, 1:55:25.792443 pm UUID: ec93455a-eea0-334e-9efa-242e29b5d8c8 Ancestors: CollectionsTests-pre.314 Updates a test for Colletions-mt.849 (inbox). I think it is best to call #printString on a delimiter if desired but use #asString by default. This is more flexible. =============== Diff against CollectionsTests-pre.314 =============== Item was changed: ----- Method: CollectionTest>>testPrintOnDelimiter (in category 'tests') ----- testPrintOnDelimiter | delim | delim := ', '. {OrderedCollection new. Set new.} do: [ :coll | | emptyStream oneItemStream multiItemStream | emptyStream := String new writeStream. coll printOn: emptyStream delimiter: delim. self assert: emptyStream contents = ''. coll add: 1. oneItemStream := String new writeStream. coll printOn: oneItemStream delimiter: delim. self assert: oneItemStream contents = '1'. coll add: 2; add: 3. multiItemStream := String new writeStream. coll printOn: multiItemStream delimiter: ', '. + self assert: multiItemStream contents = '1, 2, 3'. + + multiItemStream := String new writeStream. + coll printOn: multiItemStream delimiter: ', ' printString. self assert: multiItemStream contents = '1'', ''2'', ''3'.]!

1 0

The Trunk: Collections-mt.848.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-mt.848.mcz ==================== Summary ==================== Name: Collections-mt.848 Author: mt Time: 14 August 2019, 3:51:55.072512 pm UUID: 374f81b1-f8c1-1a49-9078-ce11ed34de8b Ancestors: Collections-fn.847 Resolve the discussion about Collections-ct.827 (http://forum.world.st/The-Inbox-Collections-ct-827-mcz-td5099876.html) to move or not to move #joinSeparatedBy:. 1) Do not move it. 2) Document the decision in #joinSeparatedBy:. 3) Prepare similar "print-on-delimiter" on Collection for deprecation. 4) Add #joinOn: ... similar to #printElemetsOn:. So, there is still that #printElementsOn: working on all kinds of Collection. =============== Diff against Collections-fn.847 =============== Item was changed: + ----- Method: Collection>>asCommaString (in category 'printing - obsolete') ----- - ----- Method: Collection>>asCommaString (in category 'printing') ----- asCommaString "Return collection printed as 'a, b, c' " + self flag: #deprecate. + ^ self asArray joinSeparatedBy: ', ' - ^String streamContents: [:s | self asStringOn: s delimiter: ', '] ! Item was changed: + ----- Method: Collection>>asCommaStringAnd (in category 'printing - obsolete') ----- - ----- Method: Collection>>asCommaStringAnd (in category 'printing') ----- asCommaStringAnd "Return collection printed as 'a, b and c' " + self flag: #deprecate. ^String streamContents: [:s | self asStringOn: s delimiter: ', ' last: ' and '] ! Item was changed: + ----- Method: Collection>>asStringOn:delimiter: (in category 'printing - obsolete') ----- - ----- Method: Collection>>asStringOn:delimiter: (in category 'printing') ----- asStringOn: aStream delimiter: delimString - "Print elements on a stream separated - with a delimiter String like: 'a, b, c' - Uses #asString instead of #print:." + self flag: #deprecate. + ^ self asArray joinSeparatedBy: delimString! - self do: [:elem | aStream nextPutAll: elem asString] - separatedBy: [aStream nextPutAll: delimString]! Item was changed: + ----- Method: Collection>>asStringOn:delimiter:last: (in category 'printing - obsolete') ----- - ----- Method: Collection>>asStringOn:delimiter:last: (in category 'printing') ----- asStringOn: aStream delimiter: delimString last: lastDelimString "Print elements on a stream separated with a delimiter between all the elements and with a special one before the last like: 'a, b and c'. Uses #asString instead of #print: Note: Feel free to improve the code to detect the last element." | n sz | + self flag: #deprecate. + n := 1. sz := self size. self do: [:elem | n := n + 1. aStream nextPutAll: elem asString] separatedBy: [ aStream nextPutAll: (n = sz ifTrue: [lastDelimString] ifFalse: [delimString])]! Item was changed: ----- Method: Collection>>printElementsOn: (in category 'printing') ----- printElementsOn: aStream - "The original code used #skip:, but some streams do not support that, - and we don't really need it." + self + printElementsOn: aStream + separatedBy: String space.! - aStream nextPut: $(. - self do: [:element | aStream print: element] separatedBy: [aStream space]. - aStream nextPut: $)! Item was added: + ----- Method: Collection>>printElementsOn:separatedBy: (in category 'printing') ----- + printElementsOn: aStream separatedBy: delimiter + "Do not use #print: on the delemiter to have more control over the output. Strings get quoted, Characters get prefixed, etc." + + self + do: [:element | aStream print: element] + separatedBy: [aStream nextPutAll: delimiter asString].! Item was changed: ----- Method: Collection>>printOn: (in category 'printing') ----- printOn: aStream "Append a sequence of characters that identify the receiver to aStream." self printNameOn: aStream. + + aStream nextPut: $(. + self printElementsOn: aStream. + aStream nextPut: $). + ! - self printElementsOn: aStream! Item was changed: + ----- Method: Collection>>printOn:delimiter: (in category 'printing - obsolete') ----- - ----- Method: Collection>>printOn:delimiter: (in category 'printing') ----- printOn: aStream delimiter: delimString - "Print elements on a stream separated - with a delimiter String like: 'a, b, c' " + self flag: #deprecate. + self + printElementsOn: aStream + separatedBy: delimString.! - self do: [:elem | aStream print: elem] separatedBy: [aStream print: delimString] - ! Item was changed: + ----- Method: Collection>>printOn:delimiter:last: (in category 'printing - obsolete') ----- - ----- Method: Collection>>printOn:delimiter:last: (in category 'printing') ----- printOn: aStream delimiter: delimString last: lastDelimString "Print elements on a stream separated with a delimiter between all the elements and with a special one before the last like: 'a, b and c' Note: Feel free to improve the code to detect the last element." | n sz | + self flag: #deprecate. n := 1. sz := self size. self do: [:elem | n := n + 1. aStream print: elem] separatedBy: [ n = sz ifTrue: [aStream print: lastDelimString] ifFalse: [aStream print: delimString]]! Item was added: + ----- Method: SequenceableCollection>>joinOn: (in category 'printing') ----- + joinOn: stream + + ^ self joinOn: stream separatedBy: ''! Item was added: + ----- Method: SequenceableCollection>>joinOn:separatedBy: (in category 'printing') ----- + joinOn: stream separatedBy: aSeparator + + self + do: [:ea | stream nextPutAll: ea asString] + separatedBy: [stream nextPutAll: aSeparator asString].! Item was changed: ----- Method: SequenceableCollection>>joinSeparatedBy: (in category 'converting') ----- joinSeparatedBy: aSeparator + "Returns a string, which is a concatenation of each element's string representation separated by another string. + + August 2019 -- http://forum.world.st/The-Inbox-Collections-ct-827-mcz-td5099876.html + There was a discussion about whether to move this method up to Collection. We identified a trade-off between (iinterface) convenience and (result) predictability. In Collection, this method would be available for Set, too. However, random result order makes such a feature questionable. What would be the result of #(1 2 3) asSet joinSeparatedBy: '-'? For such scenarios, some people argued, it would be better to explicitely call #asArray and maybe explain why a non-sequenceable collection was used in the first place." - "Returns a string, which is a concatenation of each element's string representation separated by another string." ^ String streamContents: [:stream | + self joinOn: stream separatedBy: aSeparator]! - self - do: [:ea | stream nextPutAll: ea asString] - separatedBy: [stream nextPutAll: aSeparator asString]]!

1 0

The Trunk: Collections-mt.849.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-mt.849.mcz ==================== Summary ==================== Name: Collections-mt.849 Author: mt Time: 19 August 2019, 1:52:50.361443 pm UUID: 21723f9b-83a7-5f44-8876-9db5521539b4 Ancestors: Collections-mt.848 Minor fix to re-use given stream. =============== Diff against Collections-fn.847 =============== Item was changed: + ----- Method: Collection>>asCommaString (in category 'printing - obsolete') ----- - ----- Method: Collection>>asCommaString (in category 'printing') ----- asCommaString "Return collection printed as 'a, b, c' " + self flag: #deprecate. + ^ self asArray joinSeparatedBy: ', ' - ^String streamContents: [:s | self asStringOn: s delimiter: ', '] ! Item was changed: + ----- Method: Collection>>asCommaStringAnd (in category 'printing - obsolete') ----- - ----- Method: Collection>>asCommaStringAnd (in category 'printing') ----- asCommaStringAnd "Return collection printed as 'a, b and c' " + self flag: #deprecate. ^String streamContents: [:s | self asStringOn: s delimiter: ', ' last: ' and '] ! Item was changed: + ----- Method: Collection>>asStringOn:delimiter: (in category 'printing - obsolete') ----- - ----- Method: Collection>>asStringOn:delimiter: (in category 'printing') ----- asStringOn: aStream delimiter: delimString - "Print elements on a stream separated - with a delimiter String like: 'a, b, c' - Uses #asString instead of #print:." + self flag: #deprecate. + ^ self asArray joinOn: aStream separatedBy: delimString! - self do: [:elem | aStream nextPutAll: elem asString] - separatedBy: [aStream nextPutAll: delimString]! Item was changed: + ----- Method: Collection>>asStringOn:delimiter:last: (in category 'printing - obsolete') ----- - ----- Method: Collection>>asStringOn:delimiter:last: (in category 'printing') ----- asStringOn: aStream delimiter: delimString last: lastDelimString "Print elements on a stream separated with a delimiter between all the elements and with a special one before the last like: 'a, b and c'. Uses #asString instead of #print: Note: Feel free to improve the code to detect the last element." | n sz | + self flag: #deprecate. + n := 1. sz := self size. self do: [:elem | n := n + 1. aStream nextPutAll: elem asString] separatedBy: [ aStream nextPutAll: (n = sz ifTrue: [lastDelimString] ifFalse: [delimString])]! Item was changed: ----- Method: Collection>>printElementsOn: (in category 'printing') ----- printElementsOn: aStream - "The original code used #skip:, but some streams do not support that, - and we don't really need it." + self + printElementsOn: aStream + separatedBy: String space.! - aStream nextPut: $(. - self do: [:element | aStream print: element] separatedBy: [aStream space]. - aStream nextPut: $)! Item was added: + ----- Method: Collection>>printElementsOn:separatedBy: (in category 'printing') ----- + printElementsOn: aStream separatedBy: delimiter + "Do not use #print: on the delemiter to have more control over the output. Strings get quoted, Characters get prefixed, etc." + + self + do: [:element | aStream print: element] + separatedBy: [aStream nextPutAll: delimiter asString].! Item was changed: ----- Method: Collection>>printOn: (in category 'printing') ----- printOn: aStream "Append a sequence of characters that identify the receiver to aStream." self printNameOn: aStream. + + aStream nextPut: $(. + self printElementsOn: aStream. + aStream nextPut: $). + ! - self printElementsOn: aStream! Item was changed: + ----- Method: Collection>>printOn:delimiter: (in category 'printing - obsolete') ----- - ----- Method: Collection>>printOn:delimiter: (in category 'printing') ----- printOn: aStream delimiter: delimString - "Print elements on a stream separated - with a delimiter String like: 'a, b, c' " + self flag: #deprecate. + self + printElementsOn: aStream + separatedBy: delimString.! - self do: [:elem | aStream print: elem] separatedBy: [aStream print: delimString] - ! Item was changed: + ----- Method: Collection>>printOn:delimiter:last: (in category 'printing - obsolete') ----- - ----- Method: Collection>>printOn:delimiter:last: (in category 'printing') ----- printOn: aStream delimiter: delimString last: lastDelimString "Print elements on a stream separated with a delimiter between all the elements and with a special one before the last like: 'a, b and c' Note: Feel free to improve the code to detect the last element." | n sz | + self flag: #deprecate. n := 1. sz := self size. self do: [:elem | n := n + 1. aStream print: elem] separatedBy: [ n = sz ifTrue: [aStream print: lastDelimString] ifFalse: [aStream print: delimString]]! Item was added: + ----- Method: SequenceableCollection>>joinOn: (in category 'printing') ----- + joinOn: stream + + ^ self joinOn: stream separatedBy: ''! Item was added: + ----- Method: SequenceableCollection>>joinOn:separatedBy: (in category 'printing') ----- + joinOn: stream separatedBy: aSeparator + + self + do: [:ea | stream nextPutAll: ea asString] + separatedBy: [stream nextPutAll: aSeparator asString].! Item was changed: ----- Method: SequenceableCollection>>joinSeparatedBy: (in category 'converting') ----- joinSeparatedBy: aSeparator + "Returns a string, which is a concatenation of each element's string representation separated by another string. + + August 2019 -- http://forum.world.st/The-Inbox-Collections-ct-827-mcz-td5099876.html + There was a discussion about whether to move this method up to Collection. We identified a trade-off between (iinterface) convenience and (result) predictability. In Collection, this method would be available for Set, too. However, random result order makes such a feature questionable. What would be the result of #(1 2 3) asSet joinSeparatedBy: '-'? For such scenarios, some people argued, it would be better to explicitely call #asArray and maybe explain why a non-sequenceable collection was used in the first place." - "Returns a string, which is a concatenation of each element's string representation separated by another string." ^ String streamContents: [:stream | + self joinOn: stream separatedBy: aSeparator]! - self - do: [:ea | stream nextPutAll: ea asString] - separatedBy: [stream nextPutAll: aSeparator asString]]!

1 0

The Trunk: CollectionsTests-mt.317.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-mt.317.mcz ==================== Summary ==================== Name: CollectionsTests-mt.317 Author: mt Time: 9 September 2019, 10:10:17.054051 am UUID: 95680430-56b5-c741-b406-b46897141bf3 Ancestors: CollectionsTests-ct.316, CollectionsTests-mt.315 Merges CollectionsTests-mt.315. See Collections-mt.853. =============== Diff against CollectionsTests-ct.316 =============== Item was changed: ----- Method: CollectionTest>>testPrintOnDelimiter (in category 'tests') ----- testPrintOnDelimiter | delim | delim := ', '. {OrderedCollection new. Set new.} do: [ :coll | | emptyStream oneItemStream multiItemStream | emptyStream := String new writeStream. coll printOn: emptyStream delimiter: delim. self assert: emptyStream contents = ''. coll add: 1. oneItemStream := String new writeStream. coll printOn: oneItemStream delimiter: delim. self assert: oneItemStream contents = '1'. coll add: 2; add: 3. multiItemStream := String new writeStream. coll printOn: multiItemStream delimiter: ', '. + self assert: multiItemStream contents = '1, 2, 3'. + + multiItemStream := String new writeStream. + coll printOn: multiItemStream delimiter: ', ' printString. self assert: multiItemStream contents = '1'', ''2'', ''3'.]!

1 0

The Trunk: Collections-mt.853.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-mt.853.mcz ==================== Summary ==================== Name: Collections-mt.853 Author: mt Time: 9 September 2019, 10:09:35.326051 am UUID: 9a52d97c-7987-b644-912a-974c709c7320 Ancestors: Collections-mt.851, Collections-mt.849 Merges Collections-mt.849. Note that this does only mark certain messages as "to deprecate", which has not happened yet. =============== Diff against Collections-mt.851 =============== Item was changed: + ----- Method: Collection>>asCommaString (in category 'printing - obsolete') ----- - ----- Method: Collection>>asCommaString (in category 'printing') ----- asCommaString "Return collection printed as 'a, b, c' " + self flag: #deprecate. + ^ self asArray joinSeparatedBy: ', ' - ^String streamContents: [:s | self asStringOn: s delimiter: ', '] ! Item was changed: + ----- Method: Collection>>asCommaStringAnd (in category 'printing - obsolete') ----- - ----- Method: Collection>>asCommaStringAnd (in category 'printing') ----- asCommaStringAnd "Return collection printed as 'a, b and c' " + self flag: #deprecate. ^String streamContents: [:s | self asStringOn: s delimiter: ', ' last: ' and '] ! Item was changed: + ----- Method: Collection>>asStringOn:delimiter: (in category 'printing - obsolete') ----- - ----- Method: Collection>>asStringOn:delimiter: (in category 'printing') ----- asStringOn: aStream delimiter: delimString - "Print elements on a stream separated - with a delimiter String like: 'a, b, c' - Uses #asString instead of #print:." + self flag: #deprecate. + ^ self asArray joinOn: aStream separatedBy: delimString! - self do: [:elem | aStream nextPutAll: elem asString] - separatedBy: [aStream nextPutAll: delimString]! Item was changed: + ----- Method: Collection>>asStringOn:delimiter:last: (in category 'printing - obsolete') ----- - ----- Method: Collection>>asStringOn:delimiter:last: (in category 'printing') ----- asStringOn: aStream delimiter: delimString last: lastDelimString "Print elements on a stream separated with a delimiter between all the elements and with a special one before the last like: 'a, b and c'. Uses #asString instead of #print: Note: Feel free to improve the code to detect the last element." | n sz | + self flag: #deprecate. + n := 1. sz := self size. self do: [:elem | n := n + 1. aStream nextPutAll: elem asString] separatedBy: [ aStream nextPutAll: (n = sz ifTrue: [lastDelimString] ifFalse: [delimString])]! Item was changed: ----- Method: Collection>>printElementsOn: (in category 'printing') ----- printElementsOn: aStream - "The original code used #skip:, but some streams do not support that, - and we don't really need it." + self + printElementsOn: aStream + separatedBy: String space.! - aStream nextPut: $(. - self do: [:element | aStream print: element] separatedBy: [aStream space]. - aStream nextPut: $)! Item was added: + ----- Method: Collection>>printElementsOn:separatedBy: (in category 'printing') ----- + printElementsOn: aStream separatedBy: delimiter + "Do not use #print: on the delemiter to have more control over the output. Strings get quoted, Characters get prefixed, etc." + + self + do: [:element | aStream print: element] + separatedBy: [aStream nextPutAll: delimiter asString].! Item was changed: ----- Method: Collection>>printOn: (in category 'printing') ----- printOn: aStream "Append a sequence of characters that identify the receiver to aStream." self printNameOn: aStream. + + aStream nextPut: $(. + self printElementsOn: aStream. + aStream nextPut: $). + ! - self printElementsOn: aStream! Item was changed: + ----- Method: Collection>>printOn:delimiter: (in category 'printing - obsolete') ----- - ----- Method: Collection>>printOn:delimiter: (in category 'printing') ----- printOn: aStream delimiter: delimString - "Print elements on a stream separated - with a delimiter String like: 'a, b, c' " + self flag: #deprecate. + self + printElementsOn: aStream + separatedBy: delimString.! - self do: [:elem | aStream print: elem] separatedBy: [aStream print: delimString] - ! Item was changed: + ----- Method: Collection>>printOn:delimiter:last: (in category 'printing - obsolete') ----- - ----- Method: Collection>>printOn:delimiter:last: (in category 'printing') ----- printOn: aStream delimiter: delimString last: lastDelimString "Print elements on a stream separated with a delimiter between all the elements and with a special one before the last like: 'a, b and c' Note: Feel free to improve the code to detect the last element." | n sz | + self flag: #deprecate. n := 1. sz := self size. self do: [:elem | n := n + 1. aStream print: elem] separatedBy: [ n = sz ifTrue: [aStream print: lastDelimString] ifFalse: [aStream print: delimString]]! Item was added: + ----- Method: SequenceableCollection>>joinOn: (in category 'printing') ----- + joinOn: stream + + ^ self joinOn: stream separatedBy: ''! Item was added: + ----- Method: SequenceableCollection>>joinOn:separatedBy: (in category 'printing') ----- + joinOn: stream separatedBy: aSeparator + + self + do: [:ea | stream nextPutAll: ea asString] + separatedBy: [stream nextPutAll: aSeparator asString].! Item was changed: ----- Method: SequenceableCollection>>joinSeparatedBy: (in category 'converting') ----- joinSeparatedBy: aSeparator + "Returns a string, which is a concatenation of each element's string representation separated by another string. + + August 2019 -- http://forum.world.st/The-Inbox-Collections-ct-827-mcz-td5099876.html + There was a discussion about whether to move this method up to Collection. We identified a trade-off between (iinterface) convenience and (result) predictability. In Collection, this method would be available for Set, too. However, random result order makes such a feature questionable. What would be the result of #(1 2 3) asSet joinSeparatedBy: '-'? For such scenarios, some people argued, it would be better to explicitely call #asArray and maybe explain why a non-sequenceable collection was used in the first place." - "Returns a string, which is a concatenation of each element's string representation separated by another string." ^ String streamContents: [:stream | + self joinOn: stream separatedBy: aSeparator]! - self - do: [:ea | stream nextPutAll: ea asString] - separatedBy: [stream nextPutAll: aSeparator asString]]!

1 0

The Trunk: Compiler-mt.410.mcz
by commits＠source.squeak.org 09 Sep '19

09 Sep '19

Marcel Taeumel uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-mt.410.mcz ==================== Summary ==================== Name: Compiler-mt.410 Author: mt Time: 4 September 2019, 5:03:52.834738 pm UUID: 7ff9d1f8-5f7a-4077-b11b-ede80ada7d13 Ancestors: Compiler-TraitTest.409 Fixes ifNil:ifNotNil: decompilation. Please review. - Only decompile ifNil:ifNotNil: if temps are not closured across nested blocks. This is the same behavior as #to:(by:)do:, which does not restore #to:(by:)do: if the 'var' or 'limit' are in an outer (outer?) scope. Only relevant if programmers type the optimized source code themselves. - Note that I created a new method in DecompilerConstructor to pass 'tempReadCounts'. #to:(by:)do: is reconstructed in Decompiler, which already has access to 'tempReadCounts'. See Decompiler >> #jump:if: and #convertToDoLoop:. =============== Diff against Compiler-TraitTest.409 =============== Item was added: + ----- Method: AssignmentNode>>ifNilTemporary (in category 'private') ----- + ifNilTemporary + "(temp := object) == nil ifTrue: [...] ifFalse: [...]" + + ^ self variable! Item was added: + ----- Method: AssignmentNode>>ifNilValue (in category 'private') ----- + ifNilValue + "(temp := object) == nil ifTrue: [...] ifFalse: [...]" + + ^ self value! Item was changed: ----- Method: BlockNode>>printTemporaries:on:doPrior: (in category 'printing') ----- printTemporaries: tempSequence on: aStream doPrior: aBlock "Print any in-scope temporaries. If there are any evaluate aBlock prior to printing. Answer whether any temporaries were printed." | tempStream seen | tempSequence ifNil: [^false]. tempStream := (String new: 16) writeStream. "This is for the decompiler which canmot work out which optimized block a particular temp is local to and hence may produce diplicates as in expr ifTrue: [| aTemp | ...] ifFalse: [| aTemp | ...]" seen := Set new. tempSequence do: [:tempNode | tempNode isIndirectTempVector ifTrue: [tempNode remoteTemps do: [:tempVariableNode| (tempVariableNode scope >= 0 + and: [ + "This is for the deocmpiler which may create a block arg when converting + a ifTrue:ifFalse: into a ifNil:ifNotNil: but won't remove it from temporaries" + tempVariableNode isBlockArg not + and: [(seen includes: tempNode key) not]]) ifTrue: - and: [(seen includes: tempNode key) not]) ifTrue: [tempStream space; nextPutAll: (seen add: tempVariableNode key)]]] ifFalse: [(tempNode scope >= -1 and: ["This is for the decompiler which may create a block arg when converting + a while into a to:do: but won't remove it from temporaries" - a while into a to:do: but won't remove it form temporaries" tempNode isBlockArg not and: [(seen includes: tempNode key) not]]) ifTrue: [tempStream space; nextPutAll: (seen add: tempNode key)]]]. tempStream position = 0 ifTrue: [^false]. aBlock value. aStream nextPut: $|; nextPutAll: tempStream contents; space; nextPut: $|. ^true! Item was changed: ----- Method: Decompiler>>jump:if: (in category 'instruction decoding') ----- jump: dist if: condition | savePc sign elsePc elseStart end cond ifExpr thenBlock elseBlock thenJump elseJump condHasValue isIfNil saveStack | lastJumpIfPcStack addLast: lastPc. stack last == CascadeFlag ifTrue: [^ [self case: dist] ensure: [lastJumpIfPcStack removeLast]]. elsePc := lastPc. elseStart := pc + dist. end := limit. "Check for bfp-jmp to invert condition. Don't be fooled by a loop with a null body." sign := condition. savePc := pc. self interpretJump ifNotNil: [:elseDist| (elseDist >= 0 and: [elseStart = pc]) ifTrue: [sign := sign not. elseStart := pc + elseDist]]. pc := savePc. ifExpr := stack removeLast. (isIfNil := stack size > 0 and: [stack last == IfNilFlag]) ifTrue: [stack removeLast]. saveStack := stack. stack := OrderedCollection new. thenBlock := self blockTo: elseStart. condHasValue := hasValue or: [isIfNil]. "ensure jump is within block (in case thenExpr returns)" thenJump := exit <= end ifTrue: [exit] ifFalse: [elseStart]. "if jump goes back, then it's a loop" thenJump < elseStart ifTrue: [| blockBody blockArgs savedReadCounts blockBodyReadCounts selector | "Must be a while loop... thenJump will jump to the beginning of the while expr. In the case of while's with a block in the condition, the while expr should include more than just the last expression: find all the statements needed by searching for the node with the relevant pc." stack := saveStack. savedReadCounts := tempReadCounts copy. pc := thenJump. blockBody := self statementsTo: elsePc. blockBodyReadCounts := tempReadCounts. savedReadCounts keysAndValuesDo: [:temp :count| blockBodyReadCounts at: temp put: (blockBodyReadCounts at: temp) - count]. tempReadCounts := savedReadCounts. "discard unwanted statements from block" blockBody size - 1 timesRepeat: [statements removeLast]. blockArgs := thenBlock statements = constructor codeEmptyBlock statements ifTrue: [#()] ifFalse: [{ thenBlock }]. selector := blockArgs isEmpty ifTrue: [sign ifTrue: [#whileFalse] ifFalse: [#whileTrue]] ifFalse: [sign ifTrue: [#whileFalse:] ifFalse: [#whileTrue:]]. statements addLast: (constructor codeMessage: (constructor codeBlock: blockBody returns: false) selector: (constructor codeSelector: selector code: #macro) arguments: blockArgs). pc := elseStart. selector == #whileTrue: ifTrue: [self convertToDoLoop: blockBodyReadCounts]] ifFalse: ["Must be a conditional..." elseBlock := self blockTo: thenJump. elseJump := exit. "if elseJump is backwards, it is not part of the elseExpr" elseJump < elsePc ifTrue: [pc := lastPc]. cond := isIfNil ifTrue: [constructor codeMessage: ifExpr ifNilReceiver selector: (constructor codeSelector: (sign ifTrue: [#ifNotNil:] ifFalse: [#ifNil:]) code: #macro) arguments: (Array with: thenBlock)] ifFalse: + [(sign ifTrue: [{elseBlock. thenBlock}] ifFalse: [{thenBlock. elseBlock}]) in: [:args | + (constructor + decodeIfNilWithReceiver: ifExpr + selector: #ifTrue:ifFalse: + arguments: args + tempReadCounts: tempReadCounts) ifNil: [ + constructor + codeMessage: ifExpr + selector: (constructor codeSelector: #ifTrue:ifFalse: code: #macro) + arguments: args]]]. - [constructor - codeMessage: ifExpr - selector: (constructor codeSelector: #ifTrue:ifFalse: code: #macro) - arguments: (sign - ifTrue: [{elseBlock. thenBlock}] - ifFalse: [{thenBlock. elseBlock}])]. stack := saveStack. condHasValue ifTrue: [stack addLast: cond] ifFalse: [statements addLast: cond]]. lastJumpIfPcStack removeLast.! Item was changed: ----- Method: DecompilerConstructor>>codeMessage:selector:arguments: (in category 'constructor') ----- codeMessage: receiver selector: selector arguments: arguments | symbol | symbol := selector key. (self decodeLiteralVariableValueDereferenceWithReceiver: receiver selector: symbol arguments: arguments) ifNotNil: [:node| ^node]. + - (self decodeIfNilWithReceiver: receiver - selector: symbol - arguments: arguments) ifNotNil: [:node| ^node]. ^MessageNode new receiver: receiver selector: selector arguments: arguments precedence: symbol precedence! Item was removed: - ----- Method: DecompilerConstructor>>decodeIfNilWithReceiver:selector:arguments: (in category 'constructor') ----- - decodeIfNilWithReceiver: receiver selector: selector arguments: arguments - receiver ifNil: [ ^nil ]. "For instance, when cascading" - selector == #ifTrue:ifFalse: - ifFalse: [^ nil]. - (receiver isMessage: #== - receiver: nil - arguments: [:argNode | argNode == NodeNil]) - ifFalse: [^ nil]. - ^ (MessageNode new - receiver: receiver - selector: (SelectorNode new key: #ifTrue:ifFalse: code: #macro) - arguments: arguments - precedence: 3) - noteSpecialSelector: #ifNil:ifNotNil:! Item was added: + ----- Method: DecompilerConstructor>>decodeIfNilWithReceiver:selector:arguments:tempReadCounts: (in category 'constructor') ----- + decodeIfNilWithReceiver: receiver selector: selector arguments: arguments tempReadCounts: tempReadCounts + + | node temp | + receiver ifNil: [ ^nil ]. "For instance, when cascading" + selector == #ifTrue:ifFalse: + ifFalse: [^ nil]. + + (receiver isMessage: #== + receiver: nil + arguments: [:argNode | argNode == NodeNil]) + ifFalse: [^ nil]. + + "Like #to:(by:)do:, support only local temps." + (((temp := receiver ifNilTemporary) isNil or: [tempReadCounts includesKey: temp]) or: [ + "What about 'object ifNotNil: [:o | ]', which as not read the blockArg? Just check that there is no remote vector pointing to it." + tempReadCounts keys noneSatisfy: [:otherTemp | + otherTemp isIndirectTempVector + ifTrue: [otherTemp remoteTemps anySatisfy: [:remoteTemp | remoteTemp name = temp name]] + ifFalse: [otherTemp name = temp name]] + ]) + ifFalse: [^ nil]. + + node := (MessageNode new + receiver: receiver + selector: (SelectorNode new key: #ifTrue:ifFalse: code: #macro) + arguments: arguments + precedence: 3). + + "Reconfigure the message node to #ifNil:ifNotNil:. Note that original* instance variables keep their optimized format. See MessageNode >> #printIfNilNotNil:indent:." + node + noteSpecialSelector: #ifNil:ifNotNil:; + selector: (SelectorNode new key: #ifNil:ifNotNil:). + + temp ifNil: [^ node]. + temp isTemp ifFalse: [^ node]. + + (arguments second isJust: NodeNil) not ifTrue: [ + temp beBlockArg. + node arguments: { + arguments first. + arguments second copy arguments: { temp }; yourself } ]. + + ^ node! Item was added: + ----- Method: MessageNode>>ifNilTemporary (in category 'private') ----- + ifNilTemporary + + ^ self ifNilReceiver ifNilTemporary! Item was changed: ----- Method: MessageNode>>printIfNilNotNil:indent: (in category 'printing') ----- printIfNilNotNil: aStream indent: level + (arguments first isJust: NodeNil) ifTrue: [ + self printReceiver: receiver ifNilReceiver ifNilValue on: aStream indent: level. + ^ self printKeywords: #ifNotNil: - self printReceiver: receiver ifNilReceiver on: aStream indent: level. - - (arguments first isJust: NodeNil) ifTrue: - [^ self printKeywords: #ifNotNil: arguments: { arguments second } on: aStream indent: level]. + + (arguments second isJust: NodeNil) ifTrue: [ + self printReceiver: receiver ifNilReceiver on: aStream indent: level. + ^ self printKeywords: #ifNil: - (arguments second isJust: NodeNil) ifTrue: - [^ self printKeywords: #ifNil: arguments: { arguments first } on: aStream indent: level]. + + self printReceiver: receiver ifNilReceiver ifNilValue on: aStream indent: level. ^ self printKeywords: #ifNil:ifNotNil: arguments: arguments on: aStream indent: level! Item was changed: ----- Method: MessageNode>>printWithClosureAnalysisIfNilNotNil:indent: (in category 'printing') ----- printWithClosureAnalysisIfNilNotNil: aStream indent: level + (arguments first isJust: NodeNil) ifTrue: [ + self printWithClosureAnalysisReceiver: receiver ifNilReceiver ifNilValue on: aStream indent: level. + ^ self printWithClosureAnalysisKeywords: #ifNotNil: - self printWithClosureAnalysisReceiver: receiver ifNilReceiver on: aStream indent: level. - - (arguments first isJust: NodeNil) ifTrue: - [^self printWithClosureAnalysisKeywords: #ifNotNil: arguments: { arguments second } on: aStream indent: level]. + + (arguments second isJust: NodeNil) ifTrue: [ + self printWithClosureAnalysisReceiver: receiver ifNilReceiver on: aStream indent: level. + ^ self printWithClosureAnalysisKeywords: #ifNil: - (arguments second isJust: NodeNil) ifTrue: - [^self printWithClosureAnalysisKeywords: #ifNil: arguments: { arguments first } on: aStream indent: level]. + + self printWithClosureAnalysisReceiver: receiver ifNilReceiver ifNilValue on: aStream indent: level. + ^ self printWithClosureAnalysisKeywords: #ifNil:ifNotNil: - ^self printWithClosureAnalysisKeywords: #ifNil:ifNotNil: arguments: arguments on: aStream indent: level! Item was added: + ----- Method: ParseNode>>ifNilTemporary (in category 'private') ----- + ifNilTemporary + + ^ nil! Item was added: + ----- Method: ParseNode>>ifNilValue (in category 'private') ----- + ifNilValue + + ^self! Item was changed: ----- Method: Parser>>parseCue:noPattern:ifFail: (in category 'public access') ----- parseCue: aCue noPattern: noPattern ifFail: aBlock "Answer a MethodNode for the argument, sourceStream, that is the root of a parse tree. Parsing is done with respect to the CompilationCue to resolve variables. Errors in parsing are reported to the cue's requestor; otherwise aBlock is evaluated. The argument noPattern is a Boolean that is true if the the sourceStream does not contain a method header (i.e., for DoIts)." | methNode repeatNeeded myStream s p subSelection | myStream := aCue sourceStream. [repeatNeeded := false. p := myStream position. s := myStream upToEnd. myStream position: p. + + doitFlag := noPattern. + failBlock:= aBlock. self encoder init: aCue notifying: self. self init: myStream cue: aCue failBlock: [^ aBlock value]. subSelection := self interactive and: [cue requestor selectionInterval = (p + 1 to: p + s size)]. - doitFlag := noPattern. - failBlock:= aBlock. [methNode := self method: noPattern context: cue context] on: ReparseAfterSourceEditing do: [ :ex | repeatNeeded := true. properties := nil. "Avoid accumulating pragmas and primitives Number" myStream := ex newSource ifNil: [subSelection ifTrue: [ReadStream on: cue requestor text string from: cue requestor selectionInterval first to: cue requestor selectionInterval last] ifFalse: [ReadStream on: cue requestor text string]] ifNotNil: [:src | myStream := src readStream]]. repeatNeeded] whileTrue: [encoder := self encoder class new]. methNode sourceText: s. ^methNode !

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages September 2019