Squeak-dev April 2017

squeak-dev@lists.squeakfoundation.org

48 participants
221 discussions

The Trunk: Collections-ul.748.mcz
by commits＠source.squeak.org 23 Apr '17

23 Apr '17

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.748.mcz ==================== Summary ==================== Name: Collections-ul.748 Author: ul Time: 23 April 2017, 6:01:07.769449 pm UUID: 834a2107-7087-42e3-a165-edc40a9f65f7 Ancestors: Collections-pre.747, Collections-ul.743 - merged with Collections-ul.743 - ArrayedCollection >> #mergeSortFrom:to:by: signals errors instead of assertion failures and uses #shallowCopy instead of #clone - optimized Heap >> #removeFirst and SequenceCollection >> #beginsWith: =============== Diff against Collections-pre.747 =============== Item was changed: ----- Method: ArrayedCollection>>mergeSortFrom:to:by: (in category 'sorting') ----- mergeSortFrom: startIndex to: stopIndex by: aBlock "Sort the given range of indices using the mergesort algorithm. Mergesort is a worst-case O(N log N) sorting algorithm that usually does only half as many comparisons as heapsort or quicksort." "Details: recursively split the range to be sorted into two halves, mergesort each half, then merge the two halves together. An extra copy of the data is used as temporary storage and successive merge phases copy data back and forth between the receiver and this copy. The recursion is set up so that the final merge is performed into the receiver, resulting in the receiver being completely sorted." + | size | + (size := self size) <= 1 ifTrue: [^ self]. "nothing to do" - self size <= 1 ifTrue: [^ self]. "nothing to do" startIndex = stopIndex ifTrue: [^ self]. + 1 <= startIndex ifFalse: [ self errorSubscriptBounds: startIndex ]. + stopIndex <= size ifFalse: [ self errorSubscriptBounds: stopIndex ]. + startIndex < stopIndex ifFalse: [ self errorSubscriptBounds: startIndex ]. - self assert: [startIndex >= 1 and: [startIndex < stopIndex]]. "bad start index" - self assert: [stopIndex <= self size]. "bad stop index" self mergeSortFrom: startIndex to: stopIndex + src: self shallowCopy - src: self clone dst: self by: aBlock! Item was changed: + NonPointersOrderedCollection subclass: #FloatCollection - OrderedCollection subclass: #FloatCollection instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Sequenceable'! !FloatCollection commentStamp: 'cmm 1/28/2013 19:49' prior: 0! FloatCollctions store 32bit IEEE floating point numbers.! Item was changed: + ----- Method: FloatCollection class>>arrayType (in category 'private') ----- - ----- Method: FloatCollection class>>arrayType (in category 'overriding') ----- arrayType ^ FloatArray! Item was removed: - ----- Method: FloatCollection>>addLast: (in category 'adding') ----- - addLast: aFloat - aFloat isNumber ifFalse: [ self error: 'This collection can only store Floats.' ]. - ^ super addLast: aFloat! Item was changed: + ----- Method: FloatCollection>>asFloatArray (in category 'converting') ----- - ----- Method: FloatCollection>>asFloatArray (in category 'adding') ----- asFloatArray "Optimized version" ^array copyFrom: firstIndex to: lastIndex! Item was changed: ----- Method: Heap>>removeFirst (in category 'removing') ----- removeFirst + "Remove the root element and make sure the sorting order is okay. Optimized version for the most common use case." + + | removed | + tally = 0 ifTrue: [ self errorSubscriptBounds: 1 ]. + removed := array at: 1. + array + at: 1 put: (array at: tally); + at: tally put: nil. + (tally := tally - 1) > 1 ifTrue: [ + "Root node has at least one child." + self downHeapSingle: 1 ]. + ^removed! - "Remove the first element from the receiver" - ^self removeAt: 1! Item was added: + OrderedCollection subclass: #NonPointersOrderedCollection + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Sequenceable'! + + !NonPointersOrderedCollection commentStamp: 'ul 3/26/2017 21:38' prior: 0! + I am an OrderedCollection with an internal array holding non-pointers objects. This has the advantage that the array is never subject of garbage collection. But I can only hold objects of a given type defined by my class-side #arrayType method, which is the only method they have to implement.! Item was added: + ----- Method: NonPointersOrderedCollection class>>arrayType (in category 'private') ----- + arrayType + "This method must return a non-pointers array class." + + self subclassResponsibility! Item was added: + ----- Method: NonPointersOrderedCollection>>makeRoomAtFirst (in category 'private') ----- + makeRoomAtFirst + "Same as super without trying to store nil in the emptied slots of array." + + | tally newFirstIndex newLastIndex capacity | + tally := self size. + capacity := array size. + tally * 2 >= capacity ifTrue: [ ^self growAtFirst ]. + tally = 0 ifTrue: [ ^self resetTo: capacity + 1 ]. + newFirstIndex := capacity // 2 + 1. + newLastIndex := newFirstIndex - firstIndex + lastIndex. + 0 to: tally - 1 do: [ :offset | + array at: newLastIndex - offset put: (array at: lastIndex - offset) ]. + firstIndex := newFirstIndex. + lastIndex := newLastIndex! Item was added: + ----- Method: NonPointersOrderedCollection>>makeRoomAtLast (in category 'private') ----- + makeRoomAtLast + "Same as super without trying to store nil in the emptied slots of array." + + | tally newFirstIndex newLastIndex | + tally := self size. + tally * 2 >= lastIndex ifTrue: [ ^self growAtLast ]. + tally = 0 ifTrue: [ ^self resetTo: 1 ]. + newLastIndex := lastIndex // 2. + newFirstIndex := newLastIndex - lastIndex + firstIndex. + array + replaceFrom: newFirstIndex + to: newLastIndex + with: array + startingAt: firstIndex. + firstIndex := newFirstIndex. + lastIndex := newLastIndex! Item was added: + ----- Method: NonPointersOrderedCollection>>removeAllSuchThat: (in category 'removing') ----- + removeAllSuchThat: aBlock + "Same as super without trying to store nil in the emptied slots of array." + + | n | + n := firstIndex. + firstIndex to: lastIndex do: [ :index | + | element | + (aBlock value: (element := array at: index)) ifFalse: [ + array at: n put: element. + n := n + 1 ] ]. + lastIndex := n - 1! Item was added: + ----- Method: NonPointersOrderedCollection>>removeFirst (in category 'removing') ----- + removeFirst + "Same as super without trying to store nil in the emptied slot of array." + + | firstObject | + firstIndex > lastIndex ifTrue: [ self errorEmptyCollection ]. + firstObject := array at: firstIndex. + firstIndex := firstIndex + 1. + ^firstObject! Item was added: + ----- Method: NonPointersOrderedCollection>>removeFirst: (in category 'removing') ----- + removeFirst: n + "Same as super without trying to store nil in the emptied slots of array." + + | lastIndexToRemove result | + n < 1 ifTrue: [ self errorNoSuchElement ]. + lastIndex < (lastIndexToRemove := firstIndex + n - 1) ifTrue: [ self errorNotEnoughElements ]. + result := array copyFrom: firstIndex to: lastIndexToRemove. + firstIndex := lastIndexToRemove + 1. + ^result! Item was added: + ----- Method: NonPointersOrderedCollection>>removeIndex: (in category 'private') ----- + removeIndex: removedIndex + "Same as super without trying to store nil in the emptied slot of array." + + array + replaceFrom: removedIndex + to: lastIndex - 1 + with: array + startingAt: removedIndex + 1. + lastIndex := lastIndex - 1.! Item was added: + ----- Method: NonPointersOrderedCollection>>removeLast (in category 'removing') ----- + removeLast + "Same as super without trying to store nil in the emptied slot of array." + + | lastObject | + firstIndex > lastIndex ifTrue: [ self errorEmptyCollection ]. + lastObject := array at: lastIndex. + lastIndex := lastIndex - 1. + ^ lastObject! Item was added: + ----- Method: NonPointersOrderedCollection>>removeLast: (in category 'removing') ----- + removeLast: n + "Same as super without trying to store nil in the emptied slots of array." + + | firstIndexToRemove result | + n < 1 ifTrue: [ self errorNoSuchElement ]. + (firstIndexToRemove := lastIndex - n + 1) < firstIndex ifTrue: [ self errorNotEnoughElements ]. + result := array copyFrom: firstIndexToRemove to: lastIndex. + lastIndex := firstIndexToRemove - 1. + ^result! Item was changed: ----- Method: OrderedCollection>>collect: (in category 'enumerating') ----- collect: aBlock + "Evaluate aBlock with each of my elements as the argument. + Collect the resulting values into an OrderedCollection." - "Evaluate aBlock with each of my elements as the argument. Collect the - resulting values into a collection that is like me. Answer the new - collection. Override superclass in order to use addLast:, not at:put:." | newCollection | + newCollection := OrderedCollection new: self size. - newCollection := self species new: self size. firstIndex to: lastIndex do: [:index | newCollection addLast: (aBlock value: (array at: index))]. ^ newCollection! Item was changed: ----- Method: OrderedCollection>>collect:from:to: (in category 'enumerating') ----- collect: aBlock from: fromIndex to: toIndex + "Evaluate aBlock with each of my elements as the argument between fromIndex and toIndex. + Collect the resulting values into an OrderedCollection." + + | result offset | + offset := firstIndex - 1. + (fromIndex < 1 or:[toIndex + offset > lastIndex]) - "Override superclass in order to use addLast:, not at:put:." - | result | - (fromIndex < 1 or:[toIndex + firstIndex - 1 > lastIndex]) ifTrue: [^self errorNoSuchElement]. + result := OrderedCollection new: toIndex - fromIndex + 1. + fromIndex + offset to: toIndex + offset do: - result := self species new: toIndex - fromIndex + 1. - firstIndex + fromIndex - 1 to: firstIndex + toIndex - 1 do: [:index | result addLast: (aBlock value: (array at: index))]. ^ result ! Item was changed: ----- Method: OrderedCollection>>with:collect: (in category 'enumerating') ----- with: otherCollection collect: twoArgBlock "Collect and return the result of evaluating twoArgBlock with corresponding elements from this collection and otherCollection." | result offset size | (size := self size) = otherCollection size ifFalse: [ self error: 'otherCollection must be the same size' ]. + result := OrderedCollection new: size. - result := self species new: size. offset := 1 - firstIndex. firstIndex to: lastIndex do: [ :index | result addLast: ( twoArgBlock value: (array at: index) value: (otherCollection at: index + offset)) ]. ^result! Item was changed: ----- Method: OrderedCollection>>withIndexCollect: (in category 'enumerating') ----- withIndexCollect: elementAndIndexBlock "Just like with:collect: except that the iteration index supplies the second argument to the block. Override superclass in order to use addLast:, not at:put:." | newCollection offset | + newCollection := OrderedCollection new: self size. - newCollection := self species new: self size. offset := 1 - firstIndex. firstIndex to: lastIndex do: [:index | newCollection addLast: (elementAndIndexBlock value: (array at: index) value: index + offset) ]. ^ newCollection! Item was changed: ----- Method: SequenceableCollection>>beginsWith: (in category 'testing') ----- beginsWith: sequence "Answer true if the receiver starts with the argument collection." | sequenceSize | + ((sequenceSize := sequence size) = 0 or: [ self size < sequenceSize ]) ifTrue: [ ^false ]. - ((sequenceSize := sequence size) = 0 or: [ self size < sequence size ]) ifTrue: [ ^false ]. 1 to: sequenceSize do: [ :index | (sequence at: index) = (self at: index) ifFalse: [ ^false ] ]. ^true! Item was removed: - ----- Method: SortedCollection>>collect: (in category 'enumerating') ----- - collect: aBlock - "Evaluate aBlock with each of my elements as the argument. Collect the - resulting values into an OrderedCollection. Answer the new collection. - Override the superclass in order to produce an OrderedCollection instead - of a SortedCollection." - - | newCollection | - newCollection := OrderedCollection new: self size. - self do: [:each | newCollection addLast: (aBlock value: each)]. - ^ newCollection! Item was changed: + ----- Method: WeakOrderedCollection class>>arrayType (in category 'private') ----- - ----- Method: WeakOrderedCollection class>>arrayType (in category 'as yet unclassified') ----- arrayType ^ WeakArray!

3 3

The Trunk: Collections-ul.743.mcz
by commits＠source.squeak.org 23 Apr '17

23 Apr '17

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.743.mcz ==================== Summary ==================== Name: Collections-ul.743 Author: ul Time: 26 March 2017, 10:10:37.350006 pm UUID: 854bfcea-dba7-48c9-ba6c-9de1f457b743 Ancestors: Collections-ul.742 - OrderedCollection >> #collect: & friends return an OrderedCollection. This affects its subclasses. It fixes WeakOrderedCollection (collected objects won't vanish), FloatCollection (there'll be no errors if the collected value is not a Float) and SortedCollection (#collect: was implemented like this, but other methods were not)). Other subclasses may have to be fixed/removed. - Introduced NonPointersOrderedCollection, a common superclass for classes like FloatCollection. This fixes removal from FloatCollection, and makes it easy to create similar specialized ordered collections. =============== Diff against Collections-ul.742 =============== Item was changed: + NonPointersOrderedCollection subclass: #FloatCollection - OrderedCollection subclass: #FloatCollection instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Sequenceable'! !FloatCollection commentStamp: 'cmm 1/28/2013 19:49' prior: 0! FloatCollctions store 32bit IEEE floating point numbers.! Item was changed: + ----- Method: FloatCollection class>>arrayType (in category 'private') ----- - ----- Method: FloatCollection class>>arrayType (in category 'overriding') ----- arrayType ^ FloatArray! Item was removed: - ----- Method: FloatCollection>>addLast: (in category 'adding') ----- - addLast: aFloat - aFloat isNumber ifFalse: [ self error: 'This collection can only store Floats.' ]. - ^ super addLast: aFloat! Item was changed: + ----- Method: FloatCollection>>asFloatArray (in category 'converting') ----- - ----- Method: FloatCollection>>asFloatArray (in category 'adding') ----- asFloatArray "Optimized version" ^array copyFrom: firstIndex to: lastIndex! Item was added: + OrderedCollection subclass: #NonPointersOrderedCollection + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Sequenceable'! + + !NonPointersOrderedCollection commentStamp: 'ul 3/26/2017 21:38' prior: 0! + I am an OrderedCollection with an internal array holding non-pointers objects. This has the advantage that the array is never subject of garbage collection. But I can only hold objects of a given type defined by my class-side #arrayType method, which is the only method they have to implement.! Item was added: + ----- Method: NonPointersOrderedCollection class>>arrayType (in category 'private') ----- + arrayType + "This method must return a non-pointers array class." + + self subclassResponsibility! Item was added: + ----- Method: NonPointersOrderedCollection>>makeRoomAtFirst (in category 'private') ----- + makeRoomAtFirst + "Same as super without trying to store nil in the emptied slots of array." + + | tally newFirstIndex newLastIndex capacity | + tally := self size. + capacity := array size. + tally * 2 >= capacity ifTrue: [ ^self growAtFirst ]. + tally = 0 ifTrue: [ ^self resetTo: capacity + 1 ]. + newFirstIndex := capacity // 2 + 1. + newLastIndex := newFirstIndex - firstIndex + lastIndex. + 0 to: tally - 1 do: [ :offset | + array at: newLastIndex - offset put: (array at: lastIndex - offset) ]. + firstIndex := newFirstIndex. + lastIndex := newLastIndex! Item was added: + ----- Method: NonPointersOrderedCollection>>makeRoomAtLast (in category 'private') ----- + makeRoomAtLast + "Same as super without trying to store nil in the emptied slots of array." + + | tally newFirstIndex newLastIndex | + tally := self size. + tally * 2 >= lastIndex ifTrue: [ ^self growAtLast ]. + tally = 0 ifTrue: [ ^self resetTo: 1 ]. + newLastIndex := lastIndex // 2. + newFirstIndex := newLastIndex - lastIndex + firstIndex. + array + replaceFrom: newFirstIndex + to: newLastIndex + with: array + startingAt: firstIndex. + firstIndex := newFirstIndex. + lastIndex := newLastIndex! Item was added: + ----- Method: NonPointersOrderedCollection>>removeAllSuchThat: (in category 'removing') ----- + removeAllSuchThat: aBlock + "Same as super without trying to store nil in the emptied slots of array." + + | n | + n := firstIndex. + firstIndex to: lastIndex do: [ :index | + | element | + (aBlock value: (element := array at: index)) ifFalse: [ + array at: n put: element. + n := n + 1 ] ]. + lastIndex := n - 1! Item was added: + ----- Method: NonPointersOrderedCollection>>removeFirst (in category 'removing') ----- + removeFirst + "Same as super without trying to store nil in the emptied slot of array." + + | firstObject | + firstIndex > lastIndex ifTrue: [ self errorEmptyCollection ]. + firstObject := array at: firstIndex. + firstIndex := firstIndex + 1. + ^firstObject! Item was added: + ----- Method: NonPointersOrderedCollection>>removeFirst: (in category 'removing') ----- + removeFirst: n + "Same as super without trying to store nil in the emptied slots of array." + + | lastIndexToRemove result | + n < 1 ifTrue: [ self errorNoSuchElement ]. + lastIndex < (lastIndexToRemove := firstIndex + n - 1) ifTrue: [ self errorNotEnoughElements ]. + result := array copyFrom: firstIndex to: lastIndexToRemove. + firstIndex := lastIndexToRemove + 1. + ^result! Item was added: + ----- Method: NonPointersOrderedCollection>>removeIndex: (in category 'private') ----- + removeIndex: removedIndex + "Same as super without trying to store nil in the emptied slot of array." + + array + replaceFrom: removedIndex + to: lastIndex - 1 + with: array + startingAt: removedIndex + 1. + lastIndex := lastIndex - 1.! Item was added: + ----- Method: NonPointersOrderedCollection>>removeLast (in category 'removing') ----- + removeLast + "Same as super without trying to store nil in the emptied slot of array." + + | lastObject | + firstIndex > lastIndex ifTrue: [ self errorEmptyCollection ]. + lastObject := array at: lastIndex. + lastIndex := lastIndex - 1. + ^ lastObject! Item was added: + ----- Method: NonPointersOrderedCollection>>removeLast: (in category 'removing') ----- + removeLast: n + "Same as super without trying to store nil in the emptied slots of array." + + | firstIndexToRemove result | + n < 1 ifTrue: [ self errorNoSuchElement ]. + (firstIndexToRemove := lastIndex - n + 1) < firstIndex ifTrue: [ self errorNotEnoughElements ]. + result := array copyFrom: firstIndexToRemove to: lastIndex. + lastIndex := firstIndexToRemove - 1. + ^result! Item was changed: ----- Method: OrderedCollection>>collect: (in category 'enumerating') ----- collect: aBlock + "Evaluate aBlock with each of my elements as the argument. + Collect the resulting values into an OrderedCollection." - "Evaluate aBlock with each of my elements as the argument. Collect the - resulting values into a collection that is like me. Answer the new - collection. Override superclass in order to use addLast:, not at:put:." | newCollection | + newCollection := OrderedCollection new: self size. - newCollection := self species new: self size. firstIndex to: lastIndex do: [:index | newCollection addLast: (aBlock value: (array at: index))]. ^ newCollection! Item was changed: ----- Method: OrderedCollection>>collect:from:to: (in category 'enumerating') ----- collect: aBlock from: fromIndex to: toIndex + "Evaluate aBlock with each of my elements as the argument between fromIndex and toIndex. + Collect the resulting values into an OrderedCollection." + + | result offset | + offset := firstIndex - 1. + (fromIndex < 1 or:[toIndex + offset > lastIndex]) - "Override superclass in order to use addLast:, not at:put:." - | result | - (fromIndex < 1 or:[toIndex + firstIndex - 1 > lastIndex]) ifTrue: [^self errorNoSuchElement]. + result := OrderedCollection new: toIndex - fromIndex + 1. + fromIndex + offset to: toIndex + offset do: - result := self species new: toIndex - fromIndex + 1. - firstIndex + fromIndex - 1 to: firstIndex + toIndex - 1 do: [:index | result addLast: (aBlock value: (array at: index))]. ^ result ! Item was changed: ----- Method: OrderedCollection>>with:collect: (in category 'enumerating') ----- with: otherCollection collect: twoArgBlock "Collect and return the result of evaluating twoArgBlock with corresponding elements from this collection and otherCollection." | result offset size | (size := self size) = otherCollection size ifFalse: [ self error: 'otherCollection must be the same size' ]. + result := OrderedCollection new: size. - result := self species new: size. offset := 1 - firstIndex. firstIndex to: lastIndex do: [ :index | result addLast: ( twoArgBlock value: (array at: index) value: (otherCollection at: index + offset)) ]. ^result! Item was changed: ----- Method: OrderedCollection>>withIndexCollect: (in category 'enumerating') ----- withIndexCollect: elementAndIndexBlock "Just like with:collect: except that the iteration index supplies the second argument to the block. Override superclass in order to use addLast:, not at:put:." | newCollection offset | + newCollection := OrderedCollection new: self size. - newCollection := self species new: self size. offset := 1 - firstIndex. firstIndex to: lastIndex do: [:index | newCollection addLast: (elementAndIndexBlock value: (array at: index) value: index + offset) ]. ^ newCollection! Item was removed: - ----- Method: SortedCollection>>collect: (in category 'enumerating') ----- - collect: aBlock - "Evaluate aBlock with each of my elements as the argument. Collect the - resulting values into an OrderedCollection. Answer the new collection. - Override the superclass in order to produce an OrderedCollection instead - of a SortedCollection." - - | newCollection | - newCollection := OrderedCollection new: self size. - self do: [:each | newCollection addLast: (aBlock value: each)]. - ^ newCollection! Item was changed: + ----- Method: WeakOrderedCollection class>>arrayType (in category 'private') ----- - ----- Method: WeakOrderedCollection class>>arrayType (in category 'as yet unclassified') ----- arrayType ^ WeakArray!

1 0

The Trunk: MultilingualTests-ul.23.mcz
by commits＠source.squeak.org 23 Apr '17

23 Apr '17

Levente Uzonyi uploaded a new version of MultilingualTests to project The Trunk: http://source.squeak.org/trunk/MultilingualTests-ul.23.mcz ==================== Summary ==================== Name: MultilingualTests-ul.23 Author: ul Time: 23 April 2017, 8:17:33.823601 pm UUID: 4d4598b1-98ec-4129-9887-169a2c449ebb Ancestors: MultilingualTests-ul.22 - improved the error messages, added some comments, and simplified a bit MultiByteFileStreamTest >> #testByteTextConverter =============== Diff against MultilingualTests-ul.22 =============== Item was changed: ----- Method: MultiByteFileStreamTest>>testByteTextConverter (in category 'testing') ----- testByteTextConverter + + | byteCharacters | + byteCharacters := Character allByteCharacters. + ByteTextConverter allSubclassesDo: [ :converterClass | + | converter stream encoded decoded encoded2 | + converter := converterClass new. + stream := byteCharacters readStream. + "Find bytes that can be decoded by this converter." + encoded := byteCharacters select: [ :e | (converter nextFromStream: stream) notNil ]. + "Decode those bytes." + stream := encoded readStream. + decoded := encoded collect: [ :e | converter nextFromStream: stream ]. + self assert: stream atEnd. + "Re-encode the decoded bytes using #nextPutAll:toStream:, and check if they match the original bytes." + encoded2 := String streamContents: [ :writeStream | + converter nextPutAll: decoded toStream: writeStream ]. + encoded with: encoded2 do: [ :original :reencoded | + self + assert: original charCode = reencoded charCode + description: [ '{1} could not decode or re-encode {2} using #nextPutAll:toStream:. Instead, it yielded {3}.' + format: { + converterClass name. + original charCode. + reencoded charCode } ] ]. + "Re-encode the decoded bytes using #nextPut:toStream:, and check if they match the original bytes." + encoded2 := String streamContents: [ :writeStream | + decoded do: [:e | converter nextPut: e toStream: writeStream ] ]. + encoded with: encoded2 do: [ :original :reencoded | + self + assert: original charCode = reencoded charCode + description: [ '{1} could not decode or re-encode {2} using #nextPut:toStream:. Instead, it yielded {3}.' + format: { + converterClass name. + original charCode. + reencoded charCode } ] ] ]! - | strings converterClasses | - strings := { - String newFrom: ((0 to: 255) collect: [:e | e asCharacter]). - }. - - converterClasses := ByteTextConverter allSubclasses. - converterClasses do: [:converterClass | - strings do: [:string | | converter stream encoded decoded encoded2 | - converter := converterClass new. - stream := string readStream. - encoded := string select: [:e | (converter nextFromStream: stream) notNil]. - stream := encoded readStream. - decoded := encoded collect: [:e | converter nextFromStream: stream]. - self assert: stream atEnd. - stream := String new writeStream. - converter nextPutAll: decoded toStream: stream. - encoded2 := stream contents. - self assert: (encoded2 collect: [:e | e charCode] as: Array) = (encoded collect: [:e | e charCode] as: Array). - stream := String new writeStream. - decoded do: [:e | converter nextPut: e toStream: stream]. - encoded2 := stream contents. - self assert: (encoded2 collect: [:e | e charCode] as: Array) = (encoded collect: [:e | e charCode] as: Array)]]!

1 0

Order of evaluation bug with in lined to:do: in both Opal and Squeak compilers.
by Eliot Miranda 22 Apr '17

22 Apr '17

Hi All, just stumbled across a bytecode compiler bug that's in both the Squeak compiler and the Opal compiler. I'm told by Clément that Opal mimics the bug to avoid crashing legacy code. So there may be places that depend on this bug. It would be good to eliminate the dependencies and the bug. For illustration look at the to:do: loop in the ifNil: arm in Context>>privRefresh: Context>>privRefresh "Reinitialize the receiver so that it is in the state it was at its creation." closureOrNil ifNotNil: [pc := closureOrNil startpc. self stackp: closureOrNil numArgs + closureOrNil numCopiedValues. 1 to: closureOrNil numCopiedValues do: [:i | self tempAt: closureOrNil numArgs + i put: (closureOrNil at: i)]] ifNil: [pc := method initialPC. self stackp: method numTemps. method numArgs+1 to: method numTemps do: [:i | self tempAt: i put: nil]] This should evaluate method numArgs + 1 then method numTemps. If it were written as a non-in-lined (method numArgs+1 to: method numTemps) do: [:i| self tempAt: i put: nil] then the [self tempAt: i put: nil] block would be created next. But the bytecode for the inlined version is self stackp: method numTemps. 63 <70> self 64 <84 40 03> pushRcvr: 3 67 <D6> send: numTemps 68 <E1> send: stackp: 69 <87> pop iLimit := method numTemps 70 <84 40 03> pushRcvr: 3 73 <D6> send: numTemps 74 <69> popIntoTemp: 1 i := method numArgs + 1 75 <84 40 03> pushRcvr: 3 78 <D2> send: numArgs 79 <76> pushConstant: 1 80 <B0> send: + 81 <81 40> storeIntoTemp: 0 (squeak) <69> popIntoTemp: 1 (pharo) 83 <10> pushTemp: 0 84 <11> pushTemp: 1 85 <B4> send: <= 86 <AC 0B> jumpFalse: 99 There is a second bug in the Squeak bytecode; storeIntoTemp: is used to load i whereas it should be popIntoTemp:. It was this second bug that alerted me to the order-of-evaluation bug. _,,,^..^,,,_ best, Eliot

5 8

The Inbox: GraphicsExternal-cbc.2.mcz
by commits＠source.squeak.org 21 Apr '17

21 Apr '17

A new version of GraphicsExternal was added to project The Inbox: http://source.squeak.org/inbox/GraphicsExternal-cbc.2.mcz ==================== Summary ==================== Name: GraphicsExternal-cbc.2 Author: cbc Time: 20 April 2017, 2:23:29.777447 pm UUID: 7a5bf028-13ba-7443-a625-08ecf802fdcf Ancestors: GraphicsExternal-cbc.1 Move some Form methods only used in conjuction with our classes into this package. =============== Diff against GraphicsExternal-cbc.1 =============== Item was added: + ----- Method: Form>>displayScreen (in category '*GraphicsExternal') ----- + displayScreen + "Return the display screen the receiver is allocated on. + Forms in general are Squeak internal and not allocated on any particular display." + ^nil! Item was added: + ----- Method: Form>>isBltAccelerated:for: (in category '*GraphicsExternal') ----- + isBltAccelerated: ruleInteger for: sourceForm + "Return true if the receiver can perform accelerated blts operations by itself" + ^false! Item was added: + ----- Method: Form>>isExternalForm (in category '*GraphicsExternal') ----- + isExternalForm + ^false! Item was added: + ----- Method: Form>>isFillAccelerated:for: (in category '*GraphicsExternal') ----- + isFillAccelerated: ruleInteger for: aColor + "Return true if the receiver can perform accelerated fill operations by itself" + ^false!

4 4

The Trunk: Multilingual-pre.223.mcz
by commits＠source.squeak.org 21 Apr '17

21 Apr '17

Patrick Rein uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-pre.223.mcz ==================== Summary ==================== Name: Multilingual-pre.223 Author: pre Time: 21 April 2017, 12:11:40.94494 pm UUID: 184ff1ba-857b-8847-8de2-7bb0a2eb9f5a Ancestors: Multilingual-pre.222 Undoes the previous refactoring after a discussion with topa on class initializers... Also reformats decoding table source and adds a latin9 converter =============== Diff against Multilingual-pre.222 =============== Item was added: + ----- Method: CP1250TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was added: + ----- Method: CP1252TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was changed: ----- Method: CP1252TextConverter class>>initializeDecodeTable (in category 'class initialization') ----- initializeDecodeTable decodeTable := (0 to: 127) , #( + 16r20AC -1 16r201A 16r0192 16r201E 16r2026 16r2020 16r2021 + 16r02C6 16r2030 16r0160 16r2039 16r0152 -1 16r017D -1 + -1 16r2018 16r2019 16r201C 16r201D 16r2022 16r2013 16r2014 + 16r02DC 16r2122 16r0161 16r203A 16r0153 -1 16r017E 16r0178 + 16r00A0 16r00A1 16r00A2 16r00A3 16r00A4 16r00A5 16r00A6 16r00A7 + 16r00A8 16r00A9 16r00AA 16r00AB 16r00AC 16r00AD 16r00AE 16r00AF + 16r00B0 16r00B1 16r00B2 16r00B3 16r00B4 16r00B5 16r00B6 16r00B7 + 16r00B8 16r00B9 16r00BA 16r00BB 16r00BC 16r00BD 16r00BE 16r00BF + 16r00C0 16r00C1 16r00C2 16r00C3 16r00C4 16r00C5 16r00C6 16r00C7 + 16r00C8 16r00C9 16r00CA 16r00CB 16r00CC 16r00CD 16r00CE 16r00CF + 16r00D0 16r00D1 16r00D2 16r00D3 16r00D4 16r00D5 16r00D6 16r00D7 + 16r00D8 16r00D9 16r00DA 16r00DB 16r00DC 16r00DD 16r00DE 16r00DF + 16r00E0 16r00E1 16r00E2 16r00E3 16r00E4 16r00E5 16r00E6 16r00E7 + 16r00E8 16r00E9 16r00EA 16r00EB 16r00EC 16r00ED 16r00EE 16r00EF + 16r00F0 16r00F1 16r00F2 16r00F3 16r00F4 16r00F5 16r00F6 16r00F7 + 16r00F8 16r00F9 16r00FA 16r00FB 16r00FC 16r00FD 16r00FE 16r00FF ).! - 16r20AC - -1 - 16r201A - 16r0192 - 16r201E - 16r2026 - 16r2020 - 16r2021 - 16r02C6 - 16r2030 - 16r0160 - 16r2039 - 16r0152 - -1 - 16r017D - -1 - -1 - 16r2018 - 16r2019 - 16r201C - 16r201D - 16r2022 - 16r2013 - 16r2014 - 16r02DC - 16r2122 - 16r0161 - 16r203A - 16r0153 - -1 - 16r017E - 16r0178 - 16r00A0 - 16r00A1 - 16r00A2 - 16r00A3 - 16r00A4 - 16r00A5 - 16r00A6 - 16r00A7 - 16r00A8 - 16r00A9 - 16r00AA - 16r00AB - 16r00AC - 16r00AD - 16r00AE - 16r00AF - 16r00B0 - 16r00B1 - 16r00B2 - 16r00B3 - 16r00B4 - 16r00B5 - 16r00B6 - 16r00B7 - 16r00B8 - 16r00B9 - 16r00BA - 16r00BB - 16r00BC - 16r00BD - 16r00BE - 16r00BF - 16r00C0 - 16r00C1 - 16r00C2 - 16r00C3 - 16r00C4 - 16r00C5 - 16r00C6 - 16r00C7 - 16r00C8 - 16r00C9 - 16r00CA - 16r00CB - 16r00CC - 16r00CD - 16r00CE - 16r00CF - 16r00D0 - 16r00D1 - 16r00D2 - 16r00D3 - 16r00D4 - 16r00D5 - 16r00D6 - 16r00D7 - 16r00D8 - 16r00D9 - 16r00DA - 16r00DB - 16r00DC - 16r00DD - 16r00DE - 16r00DF - 16r00E0 - 16r00E1 - 16r00E2 - 16r00E3 - 16r00E4 - 16r00E5 - 16r00E6 - 16r00E7 - 16r00E8 - 16r00E9 - 16r00EA - 16r00EB - 16r00EC - 16r00ED - 16r00EE - 16r00EF - 16r00F0 - 16r00F1 - 16r00F2 - 16r00F3 - 16r00F4 - 16r00F5 - 16r00F6 - 16r00F7 - 16r00F8 - 16r00F9 - 16r00FA - 16r00FB - 16r00FC - 16r00FD - 16r00FE - 16r00FF).! Item was added: + ----- Method: CP1253TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was added: + ByteTextConverter subclass: #CP1256TextConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Multilingual-TextConversion'! + + !CP1256TextConverter commentStamp: 'pre 4/20/2017 14:49' prior: 0! + Text converter for CP1256. Windows code page used for Maghrib states.! Item was added: + ----- Method: CP1256TextConverter class>>encodingNames (in category 'utilities') ----- + encodingNames + + ^ #('cp-1256' 'windows-1256') copy + ! Item was added: + ----- Method: CP1256TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was added: + ----- Method: CP1256TextConverter class>>initializeDecodeTable (in category 'class initialization') ----- + initializeDecodeTable + decodeTable := (0 to: 127) , #( + 16r20AC 16r067E 16r201A 16r0192 16r201E 16r2026 16r2020 16r2021 + 16r02C6 16r2030 16r0679 16r2039 16r0152 16r0686 16r0698 16r0688 + 16r06AF 16r2018 16r2019 16r201C 16r201D 16r2022 16r2013 16r2014 + 16r06A9 16r2122 16r0691 16r203A 16r0153 16r200C 16r200D 16r06BA + 16r00A0 16r060C 16r00A2 16r00A3 16r00A4 16r00A5 16r00A6 16r00A7 + 16r00A8 16r00A9 16r06BE 16r00AB 16r00AC 16r00AD 16r00AE 16r00AF + 16r00B0 16r00B1 16r00B2 16r00B3 16r00B4 16r00B5 16r00B6 16r00B7 + 16r00B8 16r00B9 16r061B 16r00BB 16r00BC 16r00BD 16r00BE 16r061F + 16r06C1 16r0621 16r0622 16r0623 16r0624 16r0625 16r0626 16r0627 + 16r0628 16r0629 16r062A 16r062B 16r062C 16r062D 16r062E 16r062F + 16r0630 16r0631 16r0632 16r0633 16r0634 16r0635 16r0636 16r00D7 + 16r0637 16r0638 16r0639 16r063A 16r0640 16r0641 16r0642 16r0643 + 16r00E0 16r0644 16r00E2 16r0645 16r0646 16r0647 16r0648 16r00E7 + 16r00E8 16r00E9 16r00EA 16r00EB 16r0649 16r064A 16r00EE 16r00EF + 16r064B 16r064C 16r064D 16r064E 16r00F4 16r064F 16r0650 16r00F7 + 16r0651 16r00F9 16r0652 16r00FB 16r00FC 16r200E 16r200F 16r06D2).! Item was added: + ----- Method: ISO88592TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was added: + ----- Method: ISO88597TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was added: + ----- Method: Latin1TextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was added: + Latin1TextConverter subclass: #Latin9TextConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Multilingual-TextConversion'! + + !Latin9TextConverter commentStamp: 'pre 4/21/2017 11:40' prior: 0! + Text converter for ISO 8859-15. An international encoding also used in Western Europe.! Item was added: + ----- Method: Latin9TextConverter class>>encodingNames (in category 'as yet unclassified') ----- + encodingNames + + ^ #('latin-9' 'latin9' 'iso-8859-15') copy. + ! Item was added: + ----- Method: Latin9TextConverter class>>initialize (in category 'as yet unclassified') ----- + initialize + + self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was added: + ----- Method: Latin9TextConverter class>>initializeDecodeTable (in category 'as yet unclassified') ----- + initializeDecodeTable + super initializeDecodeTable. + decodeTable := (decodeTable copyFrom: 1 to: 128) , #( + 16r0080 16r0081 16r0082 16r0083 16r0084 16r0085 16r0086 16r0087 + 16r0088 16r0089 16r008A 16r008B 16r008C 16r008D 16r008E 16r008F + 16r0090 16r0091 16r0092 16r0093 16r0094 16r0095 16r0096 16r0097 + 16r0098 16r0099 16r009A 16r009B 16r009C 16r009D 16r009E 16r009F + 16r00A0 16r00A1 16r00A2 16r00A3 16r20AC 16r00A5 16r0160 16r00A7 + 16r0161 16r00A9 16r00AA 16r00AB 16r00AC 16r00AD 16r00AE 16r00AF + 16r00B0 16r00B1 16r00B2 16r00B3 16r017D 16r00B5 16r00B6 16r00B7 + 16r017E 16r00B9 16r00BA 16r00BB 16r0152 16r0153 16r0178 16r00BF + 16r00C0 16r00C1 16r00C2 16r00C3 16r00C4 16r00C5 16r00C6 16r00C7 + 16r00C8 16r00C9 16r00CA 16r00CB 16r00CC 16r00CD 16r00CE 16r00CF + 16r00D0 16r00D1 16r00D2 16r00D3 16r00D4 16r00D5 16r00D6 16r00D7 + 16r00D8 16r00D9 16r00DA 16r00DB 16r00DC 16r00DD 16r00DE 16r00DF + 16r00E0 16r00E1 16r00E2 16r00E3 16r00E4 16r00E5 16r00E6 16r00E7 + 16r00E8 16r00E9 16r00EA 16r00EB 16r00EC 16r00ED 16r00EE 16r00EF + 16r00F0 16r00F1 16r00F2 16r00F3 16r00F4 16r00F5 16r00F6 16r00F7 + 16r00F8 16r00F9 16r00FA 16r00FB 16r00FC 16r00FD 16r00FE 16r00FF).! Item was added: + ----- Method: MacRomanTextConverter class>>initialize (in category 'class initialization') ----- + initialize + + super initialize! Item was changed: ----- Method: ShiftJISTextConverter class>>encodingNames (in category 'utilities') ----- encodingNames + ^ #('shift-jis' 'shift_jis' 'sjis' 'cp932') copy - ^ #('shift-jis' 'shift_jis' 'sjis') copy !

3 3

The Trunk: Multilingual-pre.221.mcz
by commits＠source.squeak.org 21 Apr '17

21 Apr '17

Patrick Rein uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-pre.221.mcz ==================== Summary ==================== Name: Multilingual-pre.221 Author: pre Time: 21 April 2017, 8:33:21.048887 am UUID: 30e94580-da2e-2f4a-9b30-a18641b2b26b Ancestors: Multilingual-pre.219 Fixed the initialization method in ByteTextConverter. Refactored the initialize of TextConverter classes as they all had the exact same source. Fixed the comment of the CP1252 converter =============== Diff against Multilingual-pre.219 =============== Item was added: + ----- Method: ByteTextConverter class>>initialize (in category 'class initialization') ----- + initialize + + self ~~ ByteTextConverter ifTrue: "This method exists for subclass use" + [self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings] + ! Item was removed: - ----- Method: CP1250TextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was changed: ByteTextConverter subclass: #CP1252TextConverter instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Multilingual-TextConversion'! + !CP1252TextConverter commentStamp: 'pre 4/20/2017 11:40' prior: 0! + Text converter for CP1252. Windows code page used in Western Europe.! - !CP1252TextConverter commentStamp: '<historical>' prior: 0! - Text converter for CP1250. Windows code page used in Eastern Europe.! Item was removed: - ----- Method: CP1252TextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was removed: - ----- Method: CP1253TextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was removed: - ----- Method: ISO88592TextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was removed: - ----- Method: ISO88597TextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was removed: - ----- Method: Latin1TextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings! Item was removed: - ----- Method: MacRomanTextConverter class>>initialize (in category 'class initialization') ----- - initialize - self initializeDecodeTable; initializeEncodeTable; initializeLatin1MapAndEncodings!

3 4

The Trunk: NetworkTests-pre.46.mcz
by commits＠source.squeak.org 21 Apr '17

21 Apr '17

Patrick Rein uploaded a new version of NetworkTests to project The Trunk: http://source.squeak.org/trunk/NetworkTests-pre.46.mcz ==================== Summary ==================== Name: NetworkTests-pre.46 Author: pre Time: 21 April 2017, 9:16:06.214887 am UUID: 5c3d3bf7-fd9b-4b48-afee-94771ad4d4bc Ancestors: NetworkTests-pre.45 Changing fixture code for an utf8 string to a more concise version =============== Diff against NetworkTests-pre.45 =============== Item was changed: ----- Method: MIMEDocumentTest>>utf8String (in category 'as yet unclassified') ----- utf8String + ^ #[199 161 84 83 67 72] asString! - ^ (ByteArray newFrom: #(199 161 84 83 67 72)) asString!

1 0

The Trunk: Kernel-dtl.1096.mcz
by commits＠source.squeak.org 21 Apr '17

21 Apr '17

David T. Lewis uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-dtl.1096.mcz ==================== Summary ==================== Name: Kernel-dtl.1096 Author: dtl Time: 18 April 2017, 11:59:08.257358 am UUID: 877ab97f-9ebe-4405-af31-fe9caab25eb6 Ancestors: Kernel-eem.1095 SmallInteger>>hashMultiply comment provided by Andres Valloud =============== Diff against Kernel-eem.1095 =============== Item was changed: ----- Method: SmallInteger>>hashMultiply (in category 'bit manipulation') ----- hashMultiply + "Multiply by 1664525 mod 2^28 without overflowing into large integers." | low | - low := self bitAnd: 16383. ^(16r260D * low + ((16r260D * (self bitShift: -14) + (16r0065 * low) bitAnd: 16383) * 16384)) bitAnd: 16r0FFFFFFF!

6 7

The Trunk: NetworkTests-pre.45.mcz
by commits＠source.squeak.org 21 Apr '17

21 Apr '17

Patrick Rein uploaded a new version of NetworkTests to project The Trunk: http://source.squeak.org/trunk/NetworkTests-pre.45.mcz ==================== Summary ==================== Name: NetworkTests-pre.45 Author: pre Time: 20 April 2017, 11:39:29.736994 am UUID: f3a657ab-0881-7449-bd72-8205a337f9ba Ancestors: NetworkTests-tonyg.44 Adds a TestCase for testing whether the charset is respected when reading in MIMEDocuments =============== Diff against NetworkTests-tonyg.44 =============== Item was added: + ClassTestCase subclass: #MIMEDocumentTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'NetworkTests-Url'! Item was added: + ----- Method: MIMEDocumentTest>>testUtf8Text (in category 'as yet unclassified') ----- + testUtf8Text + + | document | + document := MIMEDocument contentType: 'text/plain; charset="utf8"' content: self utf8String. + self assert: self utf8String utf8ToSqueak equals: document content ! Item was added: + ----- Method: MIMEDocumentTest>>utf8String (in category 'as yet unclassified') ----- + utf8String + + ^ (ByteArray newFrom: #(199 161 84 83 67 72)) asString!

3 2

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page: