Packages May 2020

packages@lists.squeakfoundation.org

1 participants
97 discussions

The Trunk: Collections-nice.894.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.894.mcz ==================== Summary ==================== Name: Collections-nice.894 Author: nice Time: 10 May 2020, 6:05:49.347017 pm UUID: e0e617fd-c214-46ec-a35d-10da6c1d6d87 Ancestors: Collections-nice.893 Clean-up required after the FloatArray rename in preamble and the ByteArray voyage in hierarchy in postcript. =============== Diff against Collections-nice.893 =============== Item was changed: + UnsignedIntegerArray variableByteSubclass: #ByteArray - ArrayedCollection variableByteSubclass: #ByteArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! !ByteArray commentStamp: '<historical>' prior: 0! I represent an ArrayedCollection whose elements are integers between 0 and 255. ! Item was added: + ----- Method: Float32Array>>* (in category 'arithmetic') ----- + * anObject + + ^self shallowCopy *= anObject! Item was added: + ----- Method: Float32Array>>*= (in category 'arithmetic') ----- + *= anObject + ^anObject isNumber + ifTrue:[self primMulScalar: anObject asFloat] + ifFalse:[self primMulArray: anObject]! Item was added: + ----- Method: Float32Array>>+ (in category 'arithmetic') ----- + + anObject + + ^self shallowCopy += anObject! Item was added: + ----- Method: Float32Array>>+= (in category 'arithmetic') ----- + += anObject + ^anObject isNumber + ifTrue:[self primAddScalar: anObject asFloat] + ifFalse:[self primAddArray: anObject]! Item was added: + ----- Method: Float32Array>>- (in category 'arithmetic') ----- + - anObject + + ^self shallowCopy -= anObject! Item was added: + ----- Method: Float32Array>>-= (in category 'arithmetic') ----- + -= anObject + ^anObject isNumber + ifTrue:[self primSubScalar: anObject asFloat] + ifFalse:[self primSubArray: anObject]! Item was added: + ----- Method: Float32Array>>/ (in category 'arithmetic') ----- + / anObject + + ^self shallowCopy /= anObject! Item was added: + ----- Method: Float32Array>>/= (in category 'arithmetic') ----- + /= anObject + ^anObject isNumber + ifTrue:[self primDivScalar: anObject asFloat] + ifFalse:[self primDivArray: anObject]! Item was added: + ----- Method: Float32Array>>\\= (in category 'arithmetic') ----- + \\= other + + other isNumber ifTrue: [ + 1 to: self size do: [:i | + self at: i put: (self at: i) \\ other + ]. + ^ self. + ]. + 1 to: (self size min: other size) do: [:i | + self at: i put: (self at: i) \\ (other at: i). + ]. + + ! Item was added: + ----- Method: Float32Array>>adaptToNumber:andSend: (in category 'arithmetic') ----- + adaptToNumber: rcvr andSend: selector + "If I am involved in arithmetic with a Number. If possible, + convert it to a float and perform the (more efficient) primitive operation." + selector == #+ ifTrue:[^self + rcvr]. + selector == #* ifTrue:[^self * rcvr]. + selector == #- ifTrue:[^self negated += rcvr]. + selector == #/ ifTrue:[ + "DO NOT USE TRIVIAL CODE + ^self reciprocal * rcvr + BECAUSE OF GRADUAL UNDERFLOW + self should: (1.0e-39 / (FloatArray with: 1.0e-39)) first < 2." + ^(self class new: self size withAll: rcvr) / self + ]. + ^super adaptToNumber: rcvr andSend: selector! Item was added: + ----- Method: Float32Array>>asFloatArray (in category 'converting') ----- + asFloatArray + ^self! Item was added: + ----- Method: Float32Array>>defaultElement (in category 'accessing') ----- + defaultElement + "Return the default element of the receiver" + ^0.0! Item was added: + ----- Method: Float32Array>>length (in category 'accessing') ----- + length + "Return the length of the receiver" + ^self squaredLength sqrt! Item was added: + ----- Method: Float32Array>>negated (in category 'arithmetic') ----- + negated + + ^self shallowCopy *= -1! Item was added: + ----- Method: Float32Array>>replaceFrom:to:with:startingAt: (in category 'private') ----- + replaceFrom: start to: stop with: replacement startingAt: repStart + "Primitive. This destructively replaces elements from start to stop in the receiver starting at index, repStart, in the collection, replacement. Answer the receiver. Range checks are performed in the primitive only. Optional. See Object documentation whatIsAPrimitive." + <primitive: 105> + super replaceFrom: start to: stop with: replacement startingAt: repStart! Item was added: + ----- Method: Float32Array>>squaredLength (in category 'accessing') ----- + squaredLength + "Return the squared length of the receiver" + ^self dot: self!

1 0

The Trunk: Collections-nice.893.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.893.mcz ==================== Summary ==================== Name: Collections-nice.893 Author: nice Time: 10 May 2020, 5:54:50.677168 pm UUID: 9f481675-6ca8-4a79-af01-3e434e28b429 Ancestors: Collections-nice.892 Create an intermediate abstract level under ArrayedCollection named RawBitsArray for grouping non pointers Arrays and enabling better factorization of some features. Rename FloatArray -> Float32Array (see preamble of this package) and let FloatArray be the abstract superclass of both Float32Array and Float64Array. Note: let FloatArray be a factory for creating Float32Array for preserving backward compatibility. Create asFloat32Array and let asFloatArray default to that. Move some pre-existing ByteArray, DoubleByteArray, WordArray DoubleWordArray under this hierarchy. For ByteArray, this require some surgery (see postscript of this package). Create similar SignedByteArray, SignedDoubleByteArray, SignedWordArray, SignedDoubleWordArray for signed integers. =============== Diff against Collections-nice.892 =============== Item was added: + (PackageInfo named: 'Collections') preamble: '"FloatArray is going to become the abstract class above Float32Array and Float64Array. + In order to avoid spurious instance migration or recompilation errors, this preamble is required." + + FloatArray rename: #Float32Array.'! Item was changed: + RawBitsArray variableWordSubclass: #ColorArray - ArrayedCollection variableWordSubclass: #ColorArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! + + !ColorArray commentStamp: 'nice 5/2/2020 17:11' prior: 0! + A ColorArray is an array of colors encoded on 32-bits. + + The encoding of colors follows the ARGB scheme. + See https://en.wikipedia.org/wiki/RGBA_color_model + + The color is decomposed into 4 channels of 8 bits (4 bytes) + - the most significant byte A is alpha channel which governs transparency + 0 means a completely transparent (invisible) color + 255 means an opaque color. + - the second most significant byte R encodes the level of red + the lower, the darker and/or least saturated + - the third most significant byte G encodes the level of green + - the least significant byte B encodes the level of blue + + Color white is encoded as 16rFFFFFFFF. + ((ColorArray with: Color white) basicAt: 1) hex. + For historical reasons, notice that Color black is encoded as a very dark blue 16rFF000001 rather than 16rFF000000. + ((ColorArray with: Color black) basicAt: 1) hex. + Other example of pure red, pure green and pure blue showing the bit position of those channels: + ((ColorArray with: Color red) basicAt: 1) hex. + ((ColorArray with: Color green) basicAt: 1) hex. + ((ColorArray with: Color blue) basicAt: 1) hex. + Color transparent is encoded as zero on all channels: + ((ColorArray with: Color transparent) basicAt: 1) hex.! Item was changed: + UnsignedIntegerArray variableDoubleByteSubclass: #DoubleByteArray - ArrayedCollection variableDoubleByteSubclass: #DoubleByteArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! + !DoubleByteArray commentStamp: 'nice 5/10/2020 17:31' prior: 0! + A DoubleByteArrays store 16-bit unsigned Integer values in the range 0 to 65535.! - !DoubleByteArray commentStamp: 'nice 10/20/2016 23:23' prior: 0! - DoubleByteArrays store 16-bit unsigned Integer values.! Item was removed: - ----- Method: DoubleByteArray>>defaultElement (in category 'accessing') ----- - defaultElement - "Return the default element of the receiver" - ^0! Item was removed: - ----- Method: DoubleByteArray>>replaceFrom:to:with:startingAt: (in category 'private') ----- - replaceFrom: start to: stop with: replacement startingAt: repStart - "Primitive. This destructively replaces elements from start to stop in the receiver starting at index, repStart, in the collection, replacement. Answer the receiver. Range checks are performed in the primitive only. Optional. See Object documentation whatIsAPrimitive." - <primitive: 105> - super replaceFrom: start to: stop with: replacement startingAt: repStart! Item was changed: + UnsignedIntegerArray variableDoubleWordSubclass: #DoubleWordArray - ArrayedCollection variableDoubleWordSubclass: #DoubleWordArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! + !DoubleWordArray commentStamp: 'nice 5/10/2020 17:32' prior: 0! + A DoubleWordArrays store 64-bit unsigned Integer values.! - !DoubleWordArray commentStamp: 'nice 9/20/2016 23:37' prior: 0! - DoubleWordArrays store 64-bit unsigned Integer values.! Item was removed: - ----- Method: DoubleWordArray>>defaultElement (in category 'accessing') ----- - defaultElement - "Return the default element of the receiver" - ^0! Item was removed: - ----- Method: DoubleWordArray>>replaceFrom:to:with:startingAt: (in category 'private') ----- - replaceFrom: start to: stop with: replacement startingAt: repStart - "Primitive. This destructively replaces elements from start to stop in the receiver starting at index, repStart, in the collection, replacement. Answer the receiver. Range checks are performed in the primitive only. Optional. See Object documentation whatIsAPrimitive." - <primitive: 105> - super replaceFrom: start to: stop with: replacement startingAt: repStart! Item was added: + FloatArray variableWordSubclass: #Float32Array + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !Float32Array commentStamp: 'nice 5/10/2020 17:32' prior: 0! + A Float32Array store single precision IEEE 754 (32 bits) floating point numbers.! Item was added: + ----- Method: Float32Array class>>fromFloat64Array: (in category 'instance creation') ----- + fromFloat64Array: aFloat64Array + ^(self new: aFloat64Array) copyFromFloat64Array: aFloat64Array! Item was added: + ----- Method: Float32Array>>= (in category 'comparing') ----- + = aFloatArray + <primitive: 'primitiveEqual' module: 'FloatArrayPlugin'> + ^super = aFloatArray! Item was added: + ----- Method: Float32Array>>asFloat32Array (in category 'converting') ----- + asFloat32Array + ^self! Item was added: + ----- Method: Float32Array>>asFloat64Array (in category 'converting') ----- + asFloat64Array + ^Float64Array fromFloatArray: self! Item was added: + ----- Method: Float32Array>>at: (in category 'accessing') ----- + at: index + <primitive: 'primitiveAt' module: 'FloatArrayPlugin'> + ^Float fromIEEE32Bit: (self basicAt: index)! Item was added: + ----- Method: Float32Array>>at:put: (in category 'accessing') ----- + at: index put: value + <primitive: 'primitiveAtPut' module: 'FloatArrayPlugin'> + value isFloat + ifTrue:[self basicAt: index put: value asIEEE32BitWord] + ifFalse:[self at: index put: value asFloat]. + ^value! Item was added: + ----- Method: Float32Array>>byteSize (in category 'accessing') ----- + byteSize + ^self size * 4! Item was added: + ----- Method: Float32Array>>bytesPerElement (in category 'accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 4! Item was added: + ----- Method: Float32Array>>copyFromFloat64Array: (in category 'initialize-release') ----- + copyFromFloat64Array: aFloat64Array + "Destructively replace the elements of self with those of aFloat64Array" + <primitive: 'primitiveFromFloat64Array' module: 'Float64ArrayPlugin'> + self isOfSameSizeCheck: aFloat64Array. + 1 to: self size do:[:i| self at: i put: (aFloat64Array at: i)].! Item was added: + ----- Method: Float32Array>>dot: (in category 'arithmetic') ----- + dot: aFloatVector + "Primitive. Return the dot product of the receiver and the argument. + Fail if the argument is not of the same size as the receiver." + + | result | + <primitive: 'primitiveDotProduct' module: 'FloatArrayPlugin'> + self size = aFloatVector size ifFalse:[^self error:'Must be equal size']. + result := 0.0. + 1 to: self size do:[:i| + result := result + ((self at: i) * (aFloatVector at: i)). + ]. + ^result! Item was added: + ----- Method: Float32Array>>hash (in category 'comparing') ----- + hash + | result | + <primitive:'primitiveHashArray' module: 'FloatArrayPlugin'> + result := 0. + 1 to: self size do:[:i| result := result + (self basicAt: i) ]. + ^result bitAnd: 16r1FFFFFFF! Item was added: + ----- Method: Float32Array>>normalize (in category 'arithmetic') ----- + normalize + "Unsafely normalize the receiver in-place (become a unit vector). + Div-by-Zero raised if len 0." + <primitive: 'primitiveNormalize' module: 'FloatArrayPlugin'> + self /= self length.! Item was added: + ----- Method: Float32Array>>primAddArray: (in category 'primitives-plugin') ----- + primAddArray: floatArray + + <primitive: 'primitiveAddFloatArray' module: 'FloatArrayPlugin'> + self isOfSameSizeCheck: floatArray. + 1 to: self size do:[:i| self at: i put: (self at: i) + (floatArray at: i)].! Item was added: + ----- Method: Float32Array>>primAddScalar: (in category 'primitives-plugin') ----- + primAddScalar: scalarValue + + <primitive: 'primitiveAddScalar' module: 'FloatArrayPlugin'> + 1 to: self size do:[:i| self at: i put: (self at: i) + scalarValue].! Item was added: + ----- Method: Float32Array>>primDivArray: (in category 'primitives-plugin') ----- + primDivArray: floatArray + + <primitive: 'primitiveDivFloatArray' module: 'FloatArrayPlugin'> + self isOfSameSizeCheck: floatArray. + 1 to: self size do:[:i| self at: i put: (self at: i) / (floatArray at: i)].! Item was added: + ----- Method: Float32Array>>primDivScalar: (in category 'primitives-plugin') ----- + primDivScalar: scalarValue + + <primitive: 'primitiveDivScalar' module: 'FloatArrayPlugin'> + 1 to: self size do:[:i| self at: i put: (self at: i) / scalarValue].! Item was added: + ----- Method: Float32Array>>primMulArray: (in category 'primitives-plugin') ----- + primMulArray: floatArray + + <primitive: 'primitiveMulFloatArray' module: 'FloatArrayPlugin'> + self isOfSameSizeCheck: floatArray. + 1 to: self size do:[:i| self at: i put: (self at: i) * (floatArray at: i)].! Item was added: + ----- Method: Float32Array>>primMulScalar: (in category 'primitives-plugin') ----- + primMulScalar: scalarValue + + <primitive: 'primitiveMulScalar' module: 'FloatArrayPlugin'> + 1 to: self size do:[:i| self at: i put: (self at: i) * scalarValue].! Item was added: + ----- Method: Float32Array>>primSubArray: (in category 'primitives-plugin') ----- + primSubArray: floatArray + + <primitive: 'primitiveSubFloatArray' module: 'FloatArrayPlugin'> + self isOfSameSizeCheck: floatArray. + 1 to: self size do:[:i| self at: i put: (self at: i) - (floatArray at: i)].! Item was added: + ----- Method: Float32Array>>primSubScalar: (in category 'primitives-plugin') ----- + primSubScalar: scalarValue + + <primitive: 'primitiveSubScalar' module: 'FloatArrayPlugin'> + 1 to: self size do:[:i| self at: i put: (self at: i) - scalarValue].! Item was added: + ----- Method: Float32Array>>sum (in category 'primitives-plugin') ----- + sum + + <primitive: 'primitiveSum' module: 'FloatArrayPlugin'> + ^ super sum! Item was changed: + FloatArray variableDoubleWordSubclass: #Float64Array - ArrayedCollection variableDoubleWordSubclass: #Float64Array instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! + !Float64Array commentStamp: 'nice 5/10/2020 17:33' prior: 0! + A Float64Array store double precision IEEE 754 (64 bits) floating point numbers.! - !Float64Array commentStamp: '<historical>' prior: 0! - Float64Arrays store 64bit IEEE floating point numbers.! Item was removed: - ----- Method: Float64Array>>* (in category 'arithmetic') ----- - * anObject - - ^self shallowCopy *= anObject! Item was removed: - ----- Method: Float64Array>>*= (in category 'arithmetic') ----- - *= anObject - ^anObject isNumber - ifTrue:[self primMulScalar: anObject asFloat] - ifFalse:[self primMulArray: anObject]! Item was removed: - ----- Method: Float64Array>>+ (in category 'arithmetic') ----- - + anObject - - ^self shallowCopy += anObject! Item was removed: - ----- Method: Float64Array>>+= (in category 'arithmetic') ----- - += anObject - ^anObject isNumber - ifTrue:[self primAddScalar: anObject asFloat] - ifFalse:[self primAddArray: anObject]! Item was removed: - ----- Method: Float64Array>>- (in category 'arithmetic') ----- - - anObject - - ^self shallowCopy -= anObject! Item was removed: - ----- Method: Float64Array>>-= (in category 'arithmetic') ----- - -= anObject - ^anObject isNumber - ifTrue:[self primSubScalar: anObject asFloat] - ifFalse:[self primSubArray: anObject]! Item was removed: - ----- Method: Float64Array>>/ (in category 'arithmetic') ----- - / anObject - - ^self shallowCopy /= anObject! Item was removed: - ----- Method: Float64Array>>/= (in category 'arithmetic') ----- - /= anObject - ^anObject isNumber - ifTrue:[self primDivScalar: anObject asFloat] - ifFalse:[self primDivArray: anObject]! Item was removed: - ----- Method: Float64Array>>\\= (in category 'arithmetic') ----- - \\= other - - other isNumber ifTrue: [ - 1 to: self size do: [:i | - self at: i put: (self at: i) \\ other - ]. - ^ self. - ]. - 1 to: (self size min: other size) do: [:i | - self at: i put: (self at: i) \\ (other at: i). - ]. - - ! Item was removed: - ----- Method: Float64Array>>adaptToNumber:andSend: (in category 'arithmetic') ----- - adaptToNumber: rcvr andSend: selector - "If I am involved in arithmetic with a Number. If possible, - convert it to a float and perform the (more efficient) primitive operation." - selector == #+ ifTrue:[^self + rcvr]. - selector == #* ifTrue:[^self * rcvr]. - selector == #- ifTrue:[^self negated += rcvr]. - selector == #/ ifTrue:[ - "DO NOT USE TRIVIAL CODE - ^self reciprocal * rcvr - BECAUSE OF GRADUAL UNDERFLOW - self should: (1.0e-39 / (Float64Array with: 1.0e-39)) first < 2." - ^(self class new: self size withAll: rcvr) / self - ]. - ^super adaptToNumber: rcvr andSend: selector! Item was added: + ----- Method: Float64Array>>asFloat32Array (in category 'converting') ----- + asFloat32Array + ^Float32Array fromFloat64Array: self! Item was removed: - ----- Method: Float64Array>>asFloatArray (in category 'converting') ----- - asFloatArray - ^FloatArray fromFloat64Array: self! Item was added: + ----- Method: Float64Array>>byteSize (in category 'accessing') ----- + byteSize + ^self size * 8! Item was added: + ----- Method: Float64Array>>bytesPerElement (in category 'accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 8! Item was removed: - ----- Method: Float64Array>>defaultElement (in category 'accessing') ----- - defaultElement - "Return the default element of the receiver" - ^0.0! Item was removed: - ----- Method: Float64Array>>length (in category 'accessing') ----- - length - "Return the length of the receiver" - ^self squaredLength sqrt! Item was removed: - ----- Method: Float64Array>>negated (in category 'arithmetic') ----- - negated - - ^self shallowCopy *= -1! Item was removed: - ----- Method: Float64Array>>replaceFrom:to:with:startingAt: (in category 'private') ----- - replaceFrom: start to: stop with: replacement startingAt: repStart - "Primitive. This destructively replaces elements from start to stop in the receiver starting at index, repStart, in the collection, replacement. Answer the receiver. Range checks are performed in the primitive only. Optional. See Object documentation whatIsAPrimitive." - <primitive: 105> - super replaceFrom: start to: stop with: replacement startingAt: repStart! Item was removed: - ----- Method: Float64Array>>squaredLength (in category 'accessing') ----- - squaredLength - "Return the squared length of the receiver" - ^self dot: self! Item was changed: + RawBitsArray subclass: #FloatArray - ArrayedCollection variableWordSubclass: #FloatArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! + !FloatArray commentStamp: 'nice 5/10/2020 16:57' prior: 0! + FloatArray is an abstract class for representing arrays of floating point values of some given precision. + Subclasses notably provide support for IEEE 754 single precision (32bits) and double precision (64) floats. + ! - !FloatArray commentStamp: '<historical>' prior: 0! - FloatArrays store 32bit IEEE floating point numbers.! Item was added: + ----- Method: FloatArray class>>basicNew: (in category 'instance creation') ----- + basicNew: anInteger + "For backward compatibility, create a 32bits FloatArray" + + self == FloatArray + ifTrue: [^Float32Array basicNew: anInteger]. + ^super basicNew: anInteger! Item was removed: - ----- Method: FloatArray class>>fromFloat64Array: (in category 'instance creation') ----- - fromFloat64Array: aFloat64Array - ^(self new: aFloat64Array) copyFromFloat64Array: aFloat64Array! Item was changed: ----- Method: FloatArray>>* (in category 'arithmetic') ----- * anObject ^self shallowCopy *= anObject! Item was changed: ----- Method: FloatArray>>*= (in category 'arithmetic') ----- *= anObject ^anObject isNumber ifTrue:[self primMulScalar: anObject asFloat] ifFalse:[self primMulArray: anObject]! Item was changed: ----- Method: FloatArray>>+ (in category 'arithmetic') ----- + anObject ^self shallowCopy += anObject! Item was changed: ----- Method: FloatArray>>+= (in category 'arithmetic') ----- += anObject ^anObject isNumber ifTrue:[self primAddScalar: anObject asFloat] ifFalse:[self primAddArray: anObject]! Item was changed: ----- Method: FloatArray>>- (in category 'arithmetic') ----- - anObject ^self shallowCopy -= anObject! Item was changed: ----- Method: FloatArray>>-= (in category 'arithmetic') ----- -= anObject ^anObject isNumber ifTrue:[self primSubScalar: anObject asFloat] ifFalse:[self primSubArray: anObject]! Item was changed: ----- Method: FloatArray>>/ (in category 'arithmetic') ----- / anObject ^self shallowCopy /= anObject! Item was changed: ----- Method: FloatArray>>/= (in category 'arithmetic') ----- /= anObject ^anObject isNumber ifTrue:[self primDivScalar: anObject asFloat] ifFalse:[self primDivArray: anObject]! Item was removed: - ----- Method: FloatArray>>= (in category 'comparing') ----- - = aFloatArray - <primitive: 'primitiveEqual' module: 'FloatArrayPlugin'> - ^super = aFloatArray! Item was changed: ----- Method: FloatArray>>\\= (in category 'arithmetic') ----- \\= other other isNumber ifTrue: [ 1 to: self size do: [:i | self at: i put: (self at: i) \\ other ]. ^ self. ]. 1 to: (self size min: other size) do: [:i | self at: i put: (self at: i) \\ (other at: i). ]. ! Item was changed: ----- Method: FloatArray>>adaptToNumber:andSend: (in category 'arithmetic') ----- adaptToNumber: rcvr andSend: selector "If I am involved in arithmetic with a Number. If possible, convert it to a float and perform the (more efficient) primitive operation." selector == #+ ifTrue:[^self + rcvr]. selector == #* ifTrue:[^self * rcvr]. selector == #- ifTrue:[^self negated += rcvr]. selector == #/ ifTrue:[ "DO NOT USE TRIVIAL CODE ^self reciprocal * rcvr BECAUSE OF GRADUAL UNDERFLOW self should: (1.0e-39 / (FloatArray with: 1.0e-39)) first < 2." ^(self class new: self size withAll: rcvr) / self ]. ^super adaptToNumber: rcvr andSend: selector! Item was removed: - ----- Method: FloatArray>>asFloat64Array (in category 'converting') ----- - asFloat64Array - ^Float64Array fromFloatArray: self! Item was changed: ----- Method: FloatArray>>asFloatArray (in category 'converting') ----- asFloatArray ^self! Item was removed: - ----- Method: FloatArray>>at: (in category 'accessing') ----- - at: index - <primitive: 'primitiveAt' module: 'FloatArrayPlugin'> - ^Float fromIEEE32Bit: (self basicAt: index)! Item was removed: - ----- Method: FloatArray>>at:put: (in category 'accessing') ----- - at: index put: value - <primitive: 'primitiveAtPut' module: 'FloatArrayPlugin'> - value isFloat - ifTrue:[self basicAt: index put: value asIEEE32BitWord] - ifFalse:[self at: index put: value asFloat]. - ^value! Item was removed: - ----- Method: FloatArray>>copyFromFloat64Array: (in category 'initialize-release') ----- - copyFromFloat64Array: aFloat64Array - "Destructively replace the elements of self with those of aFloat64Array" - <primitive: 'primitiveFromFloat64Array' module: 'Float64ArrayPlugin'> - self isOfSameSizeCheck: aFloat64Array. - 1 to: self size do:[:i| self at: i put: (aFloat64Array at: i)].! Item was changed: ----- Method: FloatArray>>defaultElement (in category 'accessing') ----- defaultElement "Return the default element of the receiver" ^0.0! Item was removed: - ----- Method: FloatArray>>dot: (in category 'arithmetic') ----- - dot: aFloatVector - "Primitive. Return the dot product of the receiver and the argument. - Fail if the argument is not of the same size as the receiver." - - | result | - <primitive: 'primitiveDotProduct' module: 'FloatArrayPlugin'> - self size = aFloatVector size ifFalse:[^self error:'Must be equal size']. - result := 0.0. - 1 to: self size do:[:i| - result := result + ((self at: i) * (aFloatVector at: i)). - ]. - ^result! Item was removed: - ----- Method: FloatArray>>hash (in category 'comparing') ----- - hash - | result | - <primitive:'primitiveHashArray' module: 'FloatArrayPlugin'> - result := 0. - 1 to: self size do:[:i| result := result + (self basicAt: i) ]. - ^result bitAnd: 16r1FFFFFFF! Item was changed: ----- Method: FloatArray>>length (in category 'accessing') ----- length "Return the length of the receiver" ^self squaredLength sqrt! Item was changed: ----- Method: FloatArray>>negated (in category 'arithmetic') ----- negated ^self shallowCopy *= -1! Item was removed: - ----- Method: FloatArray>>normalize (in category 'arithmetic') ----- - normalize - "Unsafely normalize the receiver in-place (become a unit vector). - Div-by-Zero raised if len 0." - <primitive: 'primitiveNormalize' module: 'FloatArrayPlugin'> - self /= self length.! Item was removed: - ----- Method: FloatArray>>primAddArray: (in category 'primitives-plugin') ----- - primAddArray: floatArray - - <primitive: 'primitiveAddFloatArray' module: 'FloatArrayPlugin'> - self isOfSameSizeCheck: floatArray. - 1 to: self size do:[:i| self at: i put: (self at: i) + (floatArray at: i)].! Item was removed: - ----- Method: FloatArray>>primAddScalar: (in category 'primitives-plugin') ----- - primAddScalar: scalarValue - - <primitive: 'primitiveAddScalar' module: 'FloatArrayPlugin'> - 1 to: self size do:[:i| self at: i put: (self at: i) + scalarValue].! Item was removed: - ----- Method: FloatArray>>primDivArray: (in category 'primitives-plugin') ----- - primDivArray: floatArray - - <primitive: 'primitiveDivFloatArray' module: 'FloatArrayPlugin'> - self isOfSameSizeCheck: floatArray. - 1 to: self size do:[:i| self at: i put: (self at: i) / (floatArray at: i)].! Item was removed: - ----- Method: FloatArray>>primDivScalar: (in category 'primitives-plugin') ----- - primDivScalar: scalarValue - - <primitive: 'primitiveDivScalar' module: 'FloatArrayPlugin'> - 1 to: self size do:[:i| self at: i put: (self at: i) / scalarValue].! Item was removed: - ----- Method: FloatArray>>primMulArray: (in category 'primitives-plugin') ----- - primMulArray: floatArray - - <primitive: 'primitiveMulFloatArray' module: 'FloatArrayPlugin'> - self isOfSameSizeCheck: floatArray. - 1 to: self size do:[:i| self at: i put: (self at: i) * (floatArray at: i)].! Item was removed: - ----- Method: FloatArray>>primMulScalar: (in category 'primitives-plugin') ----- - primMulScalar: scalarValue - - <primitive: 'primitiveMulScalar' module: 'FloatArrayPlugin'> - 1 to: self size do:[:i| self at: i put: (self at: i) * scalarValue].! Item was removed: - ----- Method: FloatArray>>primSubArray: (in category 'primitives-plugin') ----- - primSubArray: floatArray - - <primitive: 'primitiveSubFloatArray' module: 'FloatArrayPlugin'> - self isOfSameSizeCheck: floatArray. - 1 to: self size do:[:i| self at: i put: (self at: i) - (floatArray at: i)].! Item was removed: - ----- Method: FloatArray>>primSubScalar: (in category 'primitives-plugin') ----- - primSubScalar: scalarValue - - <primitive: 'primitiveSubScalar' module: 'FloatArrayPlugin'> - 1 to: self size do:[:i| self at: i put: (self at: i) - scalarValue].! Item was changed: ----- Method: FloatArray>>replaceFrom:to:with:startingAt: (in category 'private') ----- replaceFrom: start to: stop with: replacement startingAt: repStart "Primitive. This destructively replaces elements from start to stop in the receiver starting at index, repStart, in the collection, replacement. Answer the receiver. Range checks are performed in the primitive only. Optional. See Object documentation whatIsAPrimitive." <primitive: 105> super replaceFrom: start to: stop with: replacement startingAt: repStart! Item was changed: ----- Method: FloatArray>>squaredLength (in category 'accessing') ----- squaredLength "Return the squared length of the receiver" ^self dot: self! Item was removed: - ----- Method: FloatArray>>sum (in category 'primitives-plugin') ----- - sum - - <primitive: 'primitiveSum' module: 'FloatArrayPlugin'> - ^ super sum! Item was changed: ----- Method: FloatCollection class>>arrayType (in category 'private') ----- arrayType + ^ Float32Array! - ^ FloatArray! Item was added: + ----- Method: FloatCollection>>asFloat32Array (in category 'converting') ----- + asFloat32Array + "Optimized version" + + ^array copyFrom: firstIndex to: lastIndex! Item was removed: - ----- Method: FloatCollection>>asFloatArray (in category 'converting') ----- - asFloatArray - "Optimized version" - - ^array copyFrom: firstIndex to: lastIndex! Item was changed: + SignedWordArray variableWordSubclass: #IntegerArray - ArrayedCollection variableWordSubclass: #IntegerArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! !IntegerArray commentStamp: '<historical>' prior: 0! IntegerArrays store 32bit signed Integer values. Negative values are stored as 2's complement.! Item was removed: - ----- Method: IntegerArray>>at: (in category 'accessing') ----- - at: index - | word | - <primitive: 165> - word := self basicAt: index. - word < 16r3FFFFFFF ifTrue:[^word]. "Avoid LargeInteger computations" - ^word >= 16r80000000 "Negative?!!" - ifTrue:["word - 16r100000000" - (word bitInvert32 + 1) negated] - ifFalse:[word]! Item was removed: - ----- Method: IntegerArray>>at:put: (in category 'accessing') ----- - at: index put: anInteger - | word | - <primitive: 166> - anInteger < 0 - ifTrue:[anInteger < -16r80000000 ifTrue: [self error: anInteger asString , ' out of range']. - "word := 16r100000000 + anInteger" - word := (anInteger + 1) negated bitInvert32] - ifFalse:[anInteger > 16r7FFFFFFF ifTrue: [self error: anInteger asString , ' out of range']. - word := anInteger]. - self basicAt: index put: word. - ^anInteger! Item was removed: - ----- Method: IntegerArray>>atAllPut: (in category 'accessing') ----- - atAllPut: anInteger - | word | - anInteger < 0 - ifTrue:[anInteger < -16r80000000 ifTrue: [self error: anInteger asString , ' out of range']. - "word := 16r100000000 + anInteger" - word := (anInteger + 1) negated bitInvert32] - ifFalse:[anInteger > 16r7FFFFFFF ifTrue: [self error: anInteger asString , ' out of range']. - word := anInteger]. - self primFill: word.! Item was removed: - ----- Method: IntegerArray>>defaultElement (in category 'accessing') ----- - defaultElement - "Return the default element of the receiver" - ^0! Item was removed: - ----- Method: IntegerArray>>primFill: (in category 'private') ----- - primFill: aPositiveInteger - "Fill the receiver, an indexable bytes or words object, with the given positive integer. The range of possible fill values is [0..255] for byte arrays and [0..(2^32 - 1)] for word arrays." - - <primitive: 145> - self errorImproperStore.! Item was added: + ----- Method: Matrix>>asFloat32Array (in category 'converting') ----- + asFloat32Array + ^contents asFloat32Array! Item was removed: - ----- Method: Matrix>>asFloatArray (in category 'converting') ----- - asFloatArray - ^contents asFloatArray! Item was added: + ArrayedCollection subclass: #RawBitsArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !RawBitsArray commentStamp: 'nice 5/10/2020 16:48' prior: 0! + RawBitsArray is an abstract superclass for all arrays whose elements are not stored as pointer but as raw bits of fixed-width. + See Behavior>>#isBits. + Currently, SpurVM supports arrays of elements with a bit-width of 8, 16, 32, or 64 bits. + When accessing a specific element with #basicAt: or #basicAt:put:, the bits are exchanged under the form of an unsigned Integer. + The range of such integer must be between 0 and 2**bitWidth-1. + + The subclasses are free to re-interpret those bits as more specialized Objects. + Unless they represent unisgned Integers, they shall define at least two methods: + - #at:put: should take an object as argument and encode it into raw bits (an unsigned Integer no longer than expected bit-width) + - #at: should convert the raw bits into an Object + Note that SpurVM supports conversion to/from signed integer via primitives 165 and 166. + + The name of subclasses is historical and constrained by backward compatibility.! Item was added: + ----- Method: RawBitsArray>>atAllPut: (in category 'accessing') ----- + atAllPut: anObject + self isEmpty ifTrue: [^self]. + "Note: #primFill: (primitiveConstantFill) does only handle unsigned integer. + Let at:put: take care of properly encoding anObject as bits" + self at: 1 put: anObject. + self primFill: (self basicAt: 1)! Item was added: + ----- Method: RawBitsArray>>primFill: (in category 'private') ----- + primFill: aPositiveInteger + "Fill the receiver, an indexable bytes or words object, with the given positive integer. + The range of possible fill values is : + - [0..255] for byte arrays; + - [0..65535] for double byte arrays; + - [0..(2^32 - 1)] for word arrays; + - [0..(2^64 - 1)] for double word arrays." + + <primitive: 145> + self errorImproperStore.! Item was added: + ----- Method: SequenceableCollection>>asFloa32tArray (in category 'converting') ----- + asFloa32tArray + "Answer a Float32Array whose elements are the elements of the receiver, in + the same order." + + | floatArray | + floatArray := Float32Array new: self size. + 1 to: self size do:[:i| floatArray at: i put: (self at: i) asFloat ]. + ^floatArray! Item was added: + ----- Method: SequenceableCollection>>asFloat32Array (in category 'converting') ----- + asFloat32Array + "Answer a Float32Array whose elements are the elements of the receiver, in + the same order." + + | floatArray | + floatArray := Float32Array new: self size. + 1 to: self size do:[:i| floatArray at: i put: (self at: i) asFloat ]. + ^floatArray! Item was added: + ----- Method: SequenceableCollection>>asFloat64Array (in category 'converting') ----- + asFloat64Array + "Answer a Float64Array whose elements are the elements of the receiver, in + the same order." + + | floatArray | + floatArray := Float64Array new: self size. + 1 to: self size do:[:i| floatArray at: i put: (self at: i) asFloat ]. + ^floatArray! Item was changed: ----- Method: SequenceableCollection>>asFloatArray (in category 'converting') ----- asFloatArray + "For backward compatibility, answer a 32 bits FloatArray" - "Answer a FloatArray whose elements are the elements of the receiver, in - the same order." + ^self asFloat32Array! - | floatArray | - floatArray := FloatArray new: self size. - 1 to: self size do:[:i| floatArray at: i put: (self at: i) asFloat ]. - ^floatArray! Item was added: + SignedIntegerArray variableByteSubclass: #SignedByteArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !SignedByteArray commentStamp: 'nice 5/10/2020 17:21' prior: 0! + A SignedByteArray store 8bit signed Integer values in the range -128 to 127. + Negative values are stored as 2's complement.! Item was added: + ----- Method: SignedByteArray>>at: (in category 'accessing') ----- + at: index + | word | + <primitive: 165> + word := self basicAt: index. + ^word >= 16r80 "Negative?!!" + ifTrue:[16r100 - word] + ifFalse:[word]! Item was added: + ----- Method: SignedByteArray>>at:put: (in category 'accessing') ----- + at: index put: anInteger + | byte | + <primitive: 166> + anInteger < 0 + ifTrue: + [anInteger < -16r80 ifTrue: [self error: anInteger asString , ' out of range']. + byte := 16r100 + anInteger] + ifFalse: + [anInteger > 16r7F ifTrue: [self error: anInteger asString , ' out of range']. + byte := anInteger]. + self basicAt: index put: byte. + ^anInteger! Item was added: + ----- Method: SignedByteArray>>byteSize (in category 'accessing') ----- + byteSize + ^self size! Item was added: + ----- Method: SignedByteArray>>bytesPerElement (in category 'accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 1! Item was added: + SignedIntegerArray variableDoubleByteSubclass: #SignedDoubleByteArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !SignedDoubleByteArray commentStamp: 'nice 5/10/2020 17:21' prior: 0! + A SignedDoubleByteArray store 16bit signed Integer values in the range -32766 to 32765. + Negative values are stored as 2's complement.! Item was added: + ----- Method: SignedDoubleByteArray>>at: (in category 'accessing') ----- + at: index + | word | + <primitive: 165> + word := self basicAt: index. + ^word >= 16r8000 "Negative?!!" + ifTrue:[16r10000 - word] + ifFalse:[word]! Item was added: + ----- Method: SignedDoubleByteArray>>at:put: (in category 'accessing') ----- + at: index put: anInteger + | byte | + <primitive: 166> + anInteger < 0 + ifTrue: + [anInteger < -16r8000 ifTrue: [self error: anInteger asString , ' out of range']. + byte := 16r10000 + anInteger] + ifFalse: + [anInteger > 16r7FFF ifTrue: [self error: anInteger asString , ' out of range']. + byte := anInteger]. + self basicAt: index put: byte. + ^anInteger! Item was added: + ----- Method: SignedDoubleByteArray>>byteSize (in category 'accessing') ----- + byteSize + ^self size * 2! Item was added: + ----- Method: SignedDoubleByteArray>>bytesPerElement (in category 'accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 2! Item was added: + SignedIntegerArray variableDoubleWordSubclass: #SignedDoubleWordArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !SignedDoubleWordArray commentStamp: 'nice 5/10/2020 17:30' prior: 0! + A SignedDoubleWordArray store 64bit signed Integer values in the range (1<<63)negated (-9,223,372,036,854,775,808) to (1<<63-1) (9,223,372,036,854,775,807) - that is about 9 US-quintillon (10**3**(5+1)*9), or 9 british-trillion (10**6**3*9). + Negative values are stored as 2's complement.! Item was added: + ----- Method: SignedDoubleWordArray>>at: (in category 'accessing') ----- + at: index + | word64 | + <primitive: 165> + word64 := self basicAt: index. + word64 < SmallInteger maxVal ifTrue:[^word64]. "Avoid LargeInteger computations" + ^word64 >= 16r8000000000000000 "Negative?!!" + ifTrue: ["word64 - 16r10000000000000000" + (word64 bitInvert64 + 1) negated] + ifFalse: [word64]! Item was added: + ----- Method: SignedDoubleWordArray>>at:put: (in category 'accessing') ----- + at: index put: anInteger + | word64 | + <primitive: 166> + anInteger < 0 + ifTrue: + [anInteger < -16r8000000000000000 ifTrue: [self error: anInteger asString , ' out of range']. + "word64 := 16r10000000000000000 + anInteger" + word64 := (anInteger + 1) negated bitInvert64] + ifFalse: + [anInteger > 16r7FFFFFFFFFFFFFFF ifTrue: [self error: anInteger asString , ' out of range']. + word64 := anInteger]. + self basicAt: index put: word64. + ^anInteger! Item was added: + ----- Method: SignedDoubleWordArray>>byteSize (in category 'accessing') ----- + byteSize + ^self size * 8! Item was added: + ----- Method: SignedDoubleWordArray>>bytesPerElement (in category 'accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 8! Item was added: + RawBitsArray subclass: #SignedIntegerArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !SignedIntegerArray commentStamp: 'nice 5/10/2020 16:00' prior: 0! + SignedIntegerArray is an abstract class for all arrays of signed integer of fixed bit-width.! Item was added: + ----- Method: SignedIntegerArray>>defaultElement (in category 'accessing') ----- + defaultElement + "Return the default element of the receiver" + ^0! Item was added: + SignedIntegerArray variableWordSubclass: #SignedWordArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !SignedWordArray commentStamp: 'nice 5/10/2020 17:22' prior: 0! + A SignedWordArray store 64bit signed Integer values in the range -16r80000000 (-2,147,483,648) to 16r7FFFFFFF (2,147,483,647) + Negative values are stored as 2's complement.! Item was added: + ----- Method: SignedWordArray>>at: (in category 'accessing') ----- + at: index + | word | + <primitive: 165> + word := self basicAt: index. + word < 16r3FFFFFFF ifTrue:[^word]. "Avoid LargeInteger computations" + ^word >= 16r80000000 "Negative?!!" + ifTrue:["word - 16r100000000" + (word bitInvert32 + 1) negated] + ifFalse:[word]! Item was added: + ----- Method: SignedWordArray>>at:put: (in category 'accessing') ----- + at: index put: anInteger + | word | + <primitive: 166> + anInteger < 0 + ifTrue:[anInteger < -16r80000000 ifTrue: [self error: anInteger asString , ' out of range']. + "word := 16r100000000 + anInteger" + word := (anInteger + 1) negated bitInvert32] + ifFalse:[anInteger > 16r7FFFFFFF ifTrue: [self error: anInteger asString , ' out of range']. + word := anInteger]. + self basicAt: index put: word. + ^anInteger! Item was added: + ----- Method: SignedWordArray>>byteSize (in category 'accessing') ----- + byteSize + ^self size * 4! Item was added: + ----- Method: SignedWordArray>>bytesPerElement (in category 'accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 4! Item was added: + RawBitsArray subclass: #UnsignedIntegerArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Arrayed'! + + !UnsignedIntegerArray commentStamp: 'nice 5/10/2020 16:00' prior: 0! + UnsignedIntegerArray is an abstract class for all arrays of unsigned integer of fixed bit-width. + + ! Item was added: + ----- Method: UnsignedIntegerArray>>atAllPut: (in category 'accessing') ----- + atAllPut: value + "Fill the receiver with the given value" + + <primitive: 145> + super atAllPut: value! Item was added: + ----- Method: UnsignedIntegerArray>>defaultElement (in category 'accessing') ----- + defaultElement + "Return the default element of the receiver" + ^0! Item was added: + ----- Method: UnsignedIntegerArray>>replaceFrom:to:with:startingAt: (in category 'private') ----- + replaceFrom: start to: stop with: replacement startingAt: repStart + <primitive: 105> + ^super replaceFrom: start to: stop with: replacement startingAt: repStart ! Item was changed: + UnsignedIntegerArray variableWordSubclass: #WordArray - ArrayedCollection variableWordSubclass: #WordArray instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Collections-Arrayed'! !WordArray commentStamp: '<historical>' prior: 0! WordArrays store 32-bit unsigned Integer values. ! Item was removed: - ----- Method: WordArray>>atAllPut: (in category 'accessing') ----- - atAllPut: value - "Fill the receiver with the given value" - - <primitive: 145> - super atAllPut: value! Item was removed: - ----- Method: WordArray>>defaultElement (in category 'accessing') ----- - defaultElement - "Return the default element of the receiver" - ^0! Item was removed: - ----- Method: WordArray>>replaceFrom:to:with:startingAt: (in category 'private') ----- - replaceFrom: start to: stop with: replacement startingAt: repStart - <primitive: 105> - ^super replaceFrom: start to: stop with: replacement startingAt: repStart ! Item was changed: + (PackageInfo named: 'Collections') postscript: '"Gently move ByteArray down the hierarchy. + Since neither the format, nor the layout does change, there is no need to create a new class, nor to migrate the instances/subinstances. + ClassBuilder would do too much work and would prevent us to change such basic and dangerous classes (notably, CompiledCode is a subclass of ByteArray)." - (PackageInfo named: 'Collections') postscript: '"below, add code to be run after the loading of this package" + ByteArray superclass removeSubclass: ByteArray. + ByteArray superclass: UnsignedIntegerArray. + ByteArray class superclass: UnsignedIntegerArray class. + UnsignedIntegerArray addSubclass: ByteArray. + '! - "Make all Symbols read-only at the VM level" - Symbol allSubInstancesDo: [:s| s beReadOnlyObject]'!

1 0

The Trunk: Kernel-nice.1326.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1326.mcz ==================== Summary ==================== Name: Kernel-nice.1326 Author: nice Time: 10 May 2020, 3:26:34.805028 pm UUID: 1b10c8d1-28d3-4445-b80c-0f840ac918c7 Ancestors: Kernel-eem.1325 Fix testMoreThanOnceForEqualBlocks by using an IdentityDictionary in #once. Note that the postscript does convert the existing caches into IdentityDictionary. This is necessary in order to make the test pass if it was ran once previously. Refactor caseError so that the error message can be internationalized (change from ct, to be finished by sending translated if we wish). =============== Diff against Kernel-eem.1325 =============== Item was changed: ----- Method: BlockClosure>>once (in category 'evaluating') ----- once "Evaluate the receiver exactly once, so that repeated evaluations answer exactly the same object as the first evaluation. This allows one to intern values with the idiom myResourceMethod ^[expression] once" | cache | cache := self method propertyValueAt: #onceCache + ifAbsent: [self method propertyValueAt: #onceCache put: IdentityDictionary new]. - ifAbsent: [self method propertyValueAt: #onceCache put: Dictionary new]. ^cache at: startpcOrMethod ifAbsentPut: [self value]! Item was changed: ----- Method: Object>>caseError (in category 'error handling') ----- caseError "Report an error from an in-line or explicit case statement." + self error: ('Case not found ({1}), and no otherwise clause' format: {self printString})! - self error: 'Case not found (', self printString, '), and no otherwise clause'! Item was changed: + (PackageInfo named: 'Kernel') postscript: '"Transform the cache for #once into IdentityDictionary." - (PackageInfo named: 'Kernel') postscript: '"Activate Sista bytecodes in the image" + self systemNavigation allSelectorsAndMethodsDo: [ :behavior :selector :method | + (method hasLiteral: #once) + ifTrue: [(method propertyValueAt: #onceCache ifAbsent: []) + ifNotNil: + [:cache | + method + propertyValueAt: #onceCache + put: (cache as: IdentityDictionary)]]].'! - CompiledCode useSista: true. - '!

1 0

The Trunk: Collections-nice.892.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.892.mcz ==================== Summary ==================== Name: Collections-nice.892 Author: nice Time: 10 May 2020, 2:40:51.912657 pm UUID: 4013b080-6fde-4ada-a615-c2f7a47cede9 Ancestors: Collections-nice.891 Fixup: of course, we need a regex if we want to use the negative lookahead. Also $: needs to be escaped. Apologies for the quality of previous commit. =============== Diff against Collections-nice.891 =============== Item was changed: ----- Method: String>>findSelector (in category 'converting') ----- findSelector "Dan's code for hunting down selectors with keyword parts; while this doesn't give a true parse, in most cases it does what we want, in where it doesn't, we're none the worse for it." | sel possibleParens | sel := self withBlanksTrimmed. (sel includes: $:) ifTrue: [sel := sel copyWithRegex: '''[^'']*''' matchesReplacedWith: '''a string'''. sel := sel copyWithRegex: '#[^\[\(\s\.$]*' matchesReplacedWith: '#aSymbol'. sel := sel copyWithRegex: '\$.' matchesReplacedWith: '$x'. "handle $( $[ and $:" + sel := sel copyWithRegex: '\:(?!!=)' matchesReplacedWith: ': '. "for the style (aa max:bb) with no space" - sel := sel copyReplaceAll: ':(?!!=)' with: ': '. "for the style (aa max:bb) with no space" sel := sel copyReplaceAll: '[:' with: '[ :'. "for the style ([:a) with no space" possibleParens := sel substrings. sel := self class streamContents: [:s | | level | level := 0. possibleParens do: [:token | (level = 0 and: [token endsWith: ':']) ifTrue: [s nextPutAll: token] ifFalse: [level := level + (token occurrencesOf: $() - (token occurrencesOf: $)) + (token occurrencesOf: $[) - (token occurrencesOf: $]) + (token occurrencesOf: ${) - (token occurrencesOf: $})]]]] ifFalse: [sel := self substrings ifNotEmpty: [:tokens | tokens last]]. sel ifEmpty: [^ nil]. sel first = $# ifTrue: [sel := sel allButFirst. sel ifEmpty: [^ nil]]. sel isOctetString ifTrue: [sel := sel asOctetString]. ^ Symbol lookup: sel!

1 0

The Trunk: Compiler-nice.432.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.432.mcz ==================== Summary ==================== Name: Compiler-nice.432 Author: nice Time: 10 May 2020, 12:50:37.677856 pm UUID: f6faf998-9905-4fbd-9bc4-66a2e9f8bc93 Ancestors: Compiler-nice.431 Fix Decompiler after correction byteCodes generated by inlined #caseOf: and recompile all senders of caseOf: in postscript. Note: I have changed the logic a little bit: - the ancient CaseFlag is replaced by OtherwiseFlag (that's the purpose, we are trying to detect last case before otherwise:). - CascadeFlag is replaced by CaseFlag as soon as we have detected a potential caseOf:. I never put so many Halt in code before having it right. Good luck to the next one wanting to change the Decompiler... =============== Diff against Compiler-nice.431 =============== Item was changed: InstructionStream subclass: #Decompiler instanceVariableNames: 'constructor method instVars tempVars constTable stack statements lastPc exit caseExits lastJumpPc lastReturnPc limit hasValue blockStackBase numLocalTemps blockStartsToTempVars tempVarCount lastJumpIfPcStack tempReadCounts' + classVariableNames: 'ArgumentFlag CascadeFlag CaseFlag IfNilFlag OtherwiseFlag' - classVariableNames: 'ArgumentFlag CascadeFlag CaseFlag IfNilFlag' poolDictionaries: '' category: 'Compiler-Kernel'! !Decompiler commentStamp: 'nice 2/3/2011 22:54' prior: 0! I decompile a method in three phases: Reverser: postfix byte codes -> prefix symbolic codes (nodes and atoms) Parser: prefix symbolic codes -> node tree (same as the compiler) Printer: node tree -> text (done by the nodes) instance vars: constructor <DecompilerConstructor> an auxiliary knowing how to generate Abstract Syntax Tree (node tree) method <CompiledMethod> the method being decompiled instVars <Array of: String> the instance variables of the class implementing method tempVars <String | (OrderedCollection of: String)> hold the names of temporary variables (if known) NOTE: POLYMORPHISM WILL BE RESOLVED IN #initSymbols: constTable <Collection of: ParseNode> parse node associated with byte encoded constants (nil true false 0 1 -1 etc...) stack <OrderedCollection of: (ParseNode | String | Integer) > multipurpose... statements <OrderedCollection of: ParseNode> the statements of the method being decompiled lastPc <Integer> exit <Integer> caseExits <OrderedCollection of: Integer> - stack of exit addresses that have been seen in the branches of caseOf:'s lastJumpPc <Integer> lastReturnPc <Integer> limit <Integer> hasValue <Boolean> blockStackBase <Integer> numLocaltemps <Integer | Symbol> - number of temps local to a block; also a flag indicating decompiling a block blockStartsToTempVars <Dictionary key: Integer value: (OrderedCollection of: String)> tempVarCount <Integer> number of temp vars used by the method lastJumpIfPcStack <OrderedCollection of: Integer> the value of program counter just before the last encountered conditional jumps! Item was changed: ----- Method: Decompiler class>>initialize (in category 'class initialization') ----- initialize CascadeFlag := 'cascade'. "A unique object" CaseFlag := 'case'. "Ditto" + OtherwiseFlag := 'otherwise'. "Ditto" ArgumentFlag := 'argument'. "Ditto" IfNilFlag := 'ifNil'. "Ditto" "Decompiler initialize"! Item was changed: ----- Method: Decompiler>>case: (in category 'instruction decoding') ----- case: dist "statements = keyStmts CascadeFlag keyValueBlock ... keyStmts" | nextCase thenJump stmtStream elements b node cases otherBlock myExits | nextCase := pc + dist. + "Now add CaseFlag & keyValueBlock to statements" - "Now add CascadeFlag & keyValueBlock to statements" statements addLast: stack removeLast. + "Trick: put a flag on the stack. + If it is the last case before otherwise: block, then + - there won't be a dup of caseOf: receiver before sending = + - there won't be a pop in the case handling block" + stack addLast: OtherwiseFlag. "set for next pop" - stack addLast: CaseFlag. "set for next pop" statements addLast: (self blockForCaseTo: nextCase). + + stack last == OtherwiseFlag - - stack last == CaseFlag ifTrue: "Last case" ["ensure jump is within block (in case thenExpr returns wierdly I guess)" stack removeLast. "get rid of CaseFlag" stmtStream := ReadStream on: (self popTo: stack removeLast). elements := OrderedCollection new. b := OrderedCollection new. [stmtStream atEnd] whileFalse: + [(node := stmtStream next) == CaseFlag - [(node := stmtStream next) == CascadeFlag ifTrue: [elements addLast: (constructor codeMessage: (constructor codeBlock: b returns: false) selector: (constructor codeSelector: #-> code: #macro) arguments: (Array with: stmtStream next)). b := OrderedCollection new] ifFalse: [b addLast: node]]. b size > 0 ifTrue: [self error: 'Bad cases']. cases := constructor codeBrace: elements. "try find the end of the case" myExits := caseExits removeLast: elements size. myExits := myExits reject: [ :e | e isNil or: [ e < 0 or: [ e > method endPC ] ] ]. thenJump := myExits isEmpty ifTrue: [ nextCase ] ifFalse: [ myExits max ]. otherBlock := self blockTo: thenJump. stack addLast: (constructor codeMessage: stack removeLast selector: (constructor codeSelector: #caseOf:otherwise: code: #macro) arguments: (Array with: cases with: otherBlock))].! Item was changed: ----- Method: Decompiler>>doDup (in category 'instruction decoding') ----- doDup + stack last == CaseFlag + ifTrue: + ["We are in the process of decompiling a caseOf:" + stack addLast: CaseFlag. + ^self]. - stack last == CascadeFlag ifFalse: ["Save position and mark cascade" stack addLast: statements size. stack addLast: CascadeFlag]. stack addLast: CascadeFlag! Item was changed: ----- Method: Decompiler>>doPop (in category 'instruction decoding') ----- doPop stack isEmpty ifTrue: ["Ignore pop in first leg of ifNil for value" ^ self]. + stack last == OtherwiseFlag - stack last == CaseFlag ifTrue: [stack removeLast] ifFalse: [statements addLast: stack removeLast].! 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 == CaseFlag ifTrue: [^ [self case: dist] ensure: [lastJumpIfPcStack removeLast]]. - 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]]]. stack := saveStack. condHasValue ifTrue: [stack addLast: cond] ifFalse: [statements addLast: cond]]. lastJumpIfPcStack removeLast.! Item was changed: ----- Method: Decompiler>>send:super:numArgs: (in category 'instruction decoding') ----- send: selector super: superFlag numArgs: numArgs | args rcvr selNode msgNode messages | args := Array new: numArgs. (numArgs to: 1 by: -1) do: [:i | args at: i put: stack removeLast]. rcvr := stack removeLast. superFlag ifTrue: [rcvr := constructor codeSuper]. selNode := constructor codeAnySelector: selector. + rcvr == CaseFlag + ifTrue: + [| cases stmtStream elements node b | + selector == #= ifTrue: + [" = signals a case statement..." + statements addLast: args first. + stack addLast: rcvr. "restore CaseFlag" + ^ self]. + selector = #caseError ifFalse: [self error: 'unexpected message send while decompiling a caseOf:']. + stmtStream := ReadStream on: (self popTo: stack removeLast). + + elements := OrderedCollection new. + b := OrderedCollection new. + [stmtStream atEnd] whileFalse: + [(node := stmtStream next) == CaseFlag + ifTrue: + [elements addLast: (constructor + codeMessage: (constructor codeBlock: b returns: false) + selector: (constructor codeSelector: #-> code: #macro) + arguments: (Array with: stmtStream next)). + b := OrderedCollection new] + ifFalse: [b addLast: node]]. + b size > 0 ifTrue: [self error: 'Bad cases']. + cases := constructor codeBrace: elements. + + stack addLast: + (constructor + codeMessage: stack removeLast + selector: (constructor codeSelector: #caseOf: code: #macro) + arguments: (Array with: cases)). + ^self]. rcvr == CascadeFlag ifTrue: ["May actually be a cascade or an ifNil: for value." self willJumpIfFalse ifTrue: "= generated by a case macro" [selector == #= ifTrue: [" = signals a case statement..." statements addLast: args first. + stack removeLast; addLast: CaseFlag; addLast: CaseFlag. "Properly mark the case statement" - stack addLast: rcvr. "restore CascadeFlag" ^ self]. selector == #== ifTrue: [" == signals an ifNil: for value..." stack removeLast; removeLast. rcvr := stack removeLast. stack addLast: IfNilFlag; addLast: (constructor codeMessage: rcvr selector: selNode arguments: args). ^ self]] ifFalse: [(self willJumpIfTrue and: [selector == #==]) ifTrue: [" == signals an ifNotNil: for value..." stack removeLast; removeLast. rcvr := stack removeLast. stack addLast: IfNilFlag; addLast: (constructor codeMessage: rcvr selector: selNode arguments: args). ^ self]]. msgNode := constructor codeCascadedMessage: selNode arguments: args. stack last == CascadeFlag ifFalse: ["Last message of a cascade" statements addLast: msgNode. messages := self popTo: stack removeLast. "Depth saved by first dup" msgNode := constructor codeCascade: stack removeLast messages: messages]] ifFalse: [msgNode := constructor codeMessage: rcvr selector: selNode arguments: args]. stack addLast: msgNode! Item was changed: ----- Method: Decompiler>>statementsForCaseTo: (in category 'control') ----- statementsForCaseTo: end "Decompile the method from pc up to end and return an array of expressions. If at run time this block will leave a value on the stack, set hasValue to true. If the block ends with a jump or return, set exit to the destination of the jump, or the end of the method; otherwise, set exit = end. Leave pc = end. + Note that stack initially contains a OtherwiseFlag which will be removed by - Note that stack initially contains a CaseFlag which will be removed by a subsequent Pop instruction, so adjust the StackPos accordingly." | blockPos stackPos | blockPos := statements size. + stackPos := stack size - 1. "Adjust for OtherwiseFlag" - stackPos := stack size - 1. "Adjust for CaseFlag" [pc < end] whileTrue: [lastPc := pc. limit := end. "for performs" self interpretNextInstructionFor: self]. "If there is an additional item on the stack, it will be the value of this block." (hasValue := stack size > stackPos) ifTrue: + [stack last == OtherwiseFlag - [stack last == CaseFlag ifFalse: [ statements addLast: stack removeLast] ]. lastJumpPc = lastPc ifFalse: [exit := pc]. caseExits add: exit. ^self popTo: blockPos! Item was changed: (PackageInfo named: 'Compiler') postscript: '"below, add code to be run after the loading of this package" + "Recompile senders of caseOf:" + self systemNavigation allSelectorsAndMethodsDo: [ :behavior :selector :method | + (method hasLiteral: #caseOf:) + ifTrue: [behavior recompile: selector]]'! - "Make all relevant literals read-only, avoiding the recompile step, so as to avoid unbound methods" - self systemNavigation allSelect: - [:m| | b | - b := #notNil. - b := [:lit| lit isCollection ifTrue: [lit beReadOnlyObject. lit isArray ifTrue: [lit do: b "do: b do:"]]]. - m allLiteralsDo: - [:l| - (l isLiteral - and: [(l isCollection or: [l isNumber and: [l isReadOnlyObject not]]) - and: [(l isArray and: [m primitive == 117 and: [l == (m literalAt: 1)]]) not]]) ifTrue: - [b value: l]]. - false]'!

1 0

The Trunk: Compiler-nice.431.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.431.mcz ==================== Summary ==================== Name: Compiler-nice.431 Author: nice Time: 10 May 2020, 9:46:13.694981 am UUID: d25683a4-9332-443c-9c2f-6d331d7993a6 Ancestors: Compiler-nice.430, Compiler-ct.425 Merge Compiler-ct.425, fix the AST produced by Decompiler so that it can generate correct byteCodes. =============== Diff against Compiler-nice.430 =============== Item was changed: ----- Method: DecompilerConstructor>>codeAnyLitInd: (in category 'constructor') ----- codeAnyLitInd: association + ^LiteralVariableNode new - ^VariableNode new name: association key key: association + index: nil - index: 0 type: LdLitIndType!

1 0

The Trunk: Compiler-ct.425.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ct.425.mcz ==================== Summary ==================== Name: Compiler-ct.425 Author: ct Time: 27 March 2020, 8:10:54.53456 pm UUID: fc2a2b1f-76bc-3f4e-b971-65899bec23fb Ancestors: Compiler-ct.424 Fixes a bug regarding decompilation of literal variables The following did not work before: (Object >> #asOrderedCollection) decompile generate valueWithReceiver: 42 arguments: #(). "Error: internal compiler error; should not happen" Please review. Looking at the result of a manual compilation, I assume that literal variables such as {OrderedCollection} should be decompiled as LiteralVariableNodes. I'm however not 100% sure that this does not break anything other. =============== Diff against Compiler-ct.424 =============== Item was changed: ----- Method: DecompilerConstructor>>codeAnyLitInd: (in category 'constructor') ----- codeAnyLitInd: association + ^LiteralVariableNode new - ^VariableNode new name: association key key: association + index: nil - index: 0 type: LdLitIndType!

1 0

The Trunk: Compiler-nice.430.mcz
by commits＠source.squeak.org 10 May '20

10 May '20

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.430.mcz ==================== Summary ==================== Name: Compiler-nice.430 Author: nice Time: 10 May 2020, 9:27:14.242821 am UUID: 7ba9b09a-1ebd-4181-bf85-2dc912f42c9d Ancestors: Compiler-nice.429 Fixup: caseError must be sent to the receiver of the caseOf: message, not to the receiver of the home method. For this, we must also dup/pop in the last case whenever there is no otherwise argument. See http://forum.world.st/Problems-with-caseError-tp5111930p5112255.html TODO: also fix the Decompiler... =============== Diff against Compiler-nice.429 =============== Item was changed: ----- Method: MessageNode>>emitCodeForCase:encoder:value: (in category 'code generation') ----- emitCodeForCase: stack encoder: encoder value: forValue | braceNode sizeStream allReturn | forValue ifFalse: [^super emitCodeForEffect: stack encoder: encoder]. braceNode := arguments first. sizeStream := ReadStream on: sizes. receiver emitCodeForValue: stack encoder: encoder. "There must be at least one branch around the otherwise/caseError so the decompiler can identify the end of the otherwise/caseError." allReturn := true. "assume every case ends with a return" braceNode casesForwardDo: + [:keyNode :valueNode :last | + | thenSize elseSize dropReceiver | + dropReceiver := last and: [arguments size >= 2]. - [:keyNode :valueNode :last | | thenSize elseSize | thenSize := sizeStream next. elseSize := sizeStream next. + dropReceiver ifFalse: [encoder genDup. stack push: 1]. - last ifFalse: [encoder genDup. stack push: 1]. keyNode emitCodeForEvaluatedValue: stack encoder: encoder. keyNode pc: encoder nextPC. equalNode emitCode: stack args: 1 encoder: encoder. self emitCodeForBranchOn: false dist: thenSize pop: stack encoder: encoder. + dropReceiver ifFalse: [encoder genPop. stack pop: 1]. - last ifFalse: [encoder genPop. stack pop: 1]. valueNode emitCodeForEvaluatedValue: stack encoder: encoder. + dropReceiver ifTrue: [stack pop: 1]. - last ifTrue: [stack pop: 1]. valueNode returns ifFalse: [self emitCodeForJump: elseSize encoder: encoder. allReturn := false]. (last and: [allReturn]) ifTrue: [self emitCodeForJump: elseSize encoder: encoder]]. arguments size = 2 ifTrue: [arguments last emitCodeForEvaluatedValue: stack encoder: encoder] "otherwise: [...]" ifFalse: + ["the receiver of caseOf: has been previously dup, just send" - [NodeSelf emitCodeForValue: stack encoder: encoder. caseErrorNode emitCode: stack args: 0 encoder: encoder]! Item was changed: ----- Method: MessageNode>>sizeCodeForCase:value: (in category 'code generation') ----- sizeCodeForCase: encoder value: forValue | braceNode sizeIndex elseSize allReturn | forValue not ifTrue: [^super sizeCodeForEffect: encoder]. equalNode := encoder encodeSelector: #=. braceNode := arguments first. sizes := Array new: 2 * braceNode numElements. sizeIndex := sizes size. elseSize := arguments size = 2 ifTrue: [arguments last sizeCodeForEvaluatedValue: encoder] "otherwise: [...]" ifFalse: [caseErrorNode := encoder encodeSelector: #caseError. + "Assume that the receiver of caseOf: has been dup" + (caseErrorNode sizeCode: encoder args: 0 super: false)]. "self caseError" - (NodeSelf sizeCodeForValue: encoder) - + (caseErrorNode sizeCode: encoder args: 0 super: false)]. "self caseError" "There must be at least one branch around the otherwise/caseError so the decompiler can identify the end of the otherwise/caseError." allReturn := true. "assume every case ends with a return" braceNode casesForwardDo: [:keyNode :valueNode :last | valueNode returns ifFalse: [allReturn := false]]. braceNode casesReverseDo: + [:keyNode :valueNode :last | + | thenSize dropReceiver | + dropReceiver := last and: [arguments size >= 2]. - [:keyNode :valueNode :last | | thenSize | sizes at: sizeIndex put: elseSize. thenSize := valueNode sizeCodeForEvaluatedValue: encoder. + dropReceiver ifFalse: [thenSize := thenSize + encoder sizePop]. - last ifFalse: [thenSize := thenSize + encoder sizePop]. valueNode returns ifFalse: [thenSize := thenSize + (self sizeCode: encoder forJump: elseSize)]. (last and: [allReturn]) ifTrue: [thenSize := thenSize + (self sizeCode: encoder forJump: elseSize)]. sizes at: sizeIndex-1 put: thenSize. + dropReceiver ifFalse: [elseSize := elseSize + encoder sizeDup]. - last ifFalse: [elseSize := elseSize + encoder sizeDup]. elseSize := elseSize + (keyNode sizeCodeForEvaluatedValue: encoder) + (equalNode sizeCode: encoder args: 1 super: false) + (self sizeCode: encoder forBranchOn: false dist: thenSize) + thenSize. sizeIndex := sizeIndex - 2]. ^(receiver sizeCodeForValue: encoder) + elseSize!

1 0

The Trunk: Collections-nice.891.mcz
by commits＠source.squeak.org 09 May '20

09 May '20

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.891.mcz ==================== Summary ==================== Name: Collections-nice.891 Author: nice Time: 9 May 2020, 6:27:51.164977 pm UUID: 4b4cd1ee-3b62-4ee2-b819-5b4481f6ecee Ancestors: Collections-nice.890 Find a selector in a line containing an assignment This uses new (negative) lookahead extensions to Regex (hence requires Regex >= Regex-Core-ct.56). Example: try alt+m in following line (extracted from these changes): sel := sel copyReplaceAll: ':(?!=)' with: ': '. "blah" =============== Diff against Collections-nice.890 =============== Item was changed: ----- Method: String>>findSelector (in category 'converting') ----- findSelector "Dan's code for hunting down selectors with keyword parts; while this doesn't give a true parse, in most cases it does what we want, in where it doesn't, we're none the worse for it." | sel possibleParens | sel := self withBlanksTrimmed. (sel includes: $:) ifTrue: [sel := sel copyWithRegex: '''[^'']*''' matchesReplacedWith: '''a string'''. sel := sel copyWithRegex: '#[^\[\(\s\.$]*' matchesReplacedWith: '#aSymbol'. sel := sel copyWithRegex: '\$.' matchesReplacedWith: '$x'. "handle $( $[ and $:" + sel := sel copyReplaceAll: ':(?!!=)' with: ': '. "for the style (aa max:bb) with no space" - sel := sel copyReplaceAll: ':' with: ': '. "for the style (aa max:bb) with no space" sel := sel copyReplaceAll: '[:' with: '[ :'. "for the style ([:a) with no space" possibleParens := sel substrings. sel := self class streamContents: [:s | | level | level := 0. possibleParens do: [:token | (level = 0 and: [token endsWith: ':']) ifTrue: [s nextPutAll: token] ifFalse: [level := level + (token occurrencesOf: $() - (token occurrencesOf: $)) + (token occurrencesOf: $[) - (token occurrencesOf: $]) + (token occurrencesOf: ${) - (token occurrencesOf: $})]]]] ifFalse: [sel := self substrings ifNotEmpty: [:tokens | tokens last]]. sel ifEmpty: [^ nil]. sel first = $# ifTrue: [sel := sel allButFirst. sel ifEmpty: [^ nil]]. sel isOctetString ifTrue: [sel := sel asOctetString]. ^ Symbol lookup: sel!

1 0

The Trunk: Tests-dtl.432.mcz
by commits＠source.squeak.org 09 May '20

09 May '20

David T. Lewis uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-dtl.432.mcz ==================== Summary ==================== Name: Tests-dtl.432 Author: dtl Time: 9 May 2020, 10:26:29.208971 am UUID: 5795ad5e-343d-4ddf-abfb-00655bc2196f Ancestors: Tests-nice.431 MCConfigurationTest verifies reading and writing configuration maps as stored on a SqueakSource server. It tests the original MCConfiguration, as well as MCConfigurationExtended with support for versioning of configurations maps. Compatability tests ensure that configurations saved in the new format can be used with existing images that support only the original format. =============== Diff against Tests-nice.431 =============== Item was added: + TestCase subclass: #MCConfigurationTest + instanceVariableNames: 'sampleMcmFileContents sampleMcmStorageArray sampleMcmStorageArrayExtended sampleMcmFileContentsExtended sampleMcmFileContentsWithHistory' + classVariableNames: '' + poolDictionaries: '' + category: 'Tests-Monticello'! + + !MCConfigurationTest commentStamp: 'dtl 4/13/2020 13:43' prior: 0! + A MCConfigurationTest verifies reading and writing configuration maps as stored on a SqueakSource server. It tests the original MCConfiguration, as well as the extended MCConfigurationExtended that supports versioning of configurations maps. Compatability tests ensure that configurations saved in the new format can be used with existing images that support only the original format.! Item was added: + ----- Method: MCConfigurationTest>>sampleMcmFileContents (in category 'running') ----- + sampleMcmFileContents + "Contents of an MCM file with multiple repositories and dependencies, as saved in + the original MCM file storage format" + + "MCConfigurationTest new sampleMcmFileContents" + + ^ '( + name ''update.V3-dtl.464'' + repository (''http://source.squeak.org/trunk'') + repository (''http://www.squeaksource.com/TrunkUpdateStreamV3'') + dependency (''Kernel'' ''Kernel.V3-dtl.1319'' ''18bad077-f877-4b68-bcfd-04716bdd807d'') + dependency (''Compiler'' ''Compiler.V3-dtl.419'' ''353d296d-24a6-49f2-9b44-e8f8e216ec35'') + dependency (''Collections'' ''Collections.V3-dtl.882'' ''9c3d454c-d010-49b7-b52d-c82a89ad9c71'') + dependency (''Monticello'' ''Monticello-nice.716'' ''a1f8545a-b4f8-4bae-b349-e8bbba23816e'') + dependency (''Files'' ''Files-pre.183'' ''c7d0c859-2531-464e-87d8-3b580249731b'') + dependency (''Sound'' ''Sound-dtl.68'' ''c7b5a141-2b1b-4d24-ab88-0a96dd78600b'') + ) + ' + ! Item was added: + ----- Method: MCConfigurationTest>>sampleMcmFileContentsExtended (in category 'running') ----- + sampleMcmFileContentsExtended + "Contents of an MCM file with multiple repositories and dependencies, as saved in + the extended MCM file storage format" + + "MCConfigurationTest new sampleMcmFileContentsExtended" + + ^ '( + name ''update.V3-dtl.464'' + repository (''http://source.squeak.org/trunk'') + repository (''http://www.squeaksource.com/TrunkUpdateStreamV3'') + dependency (''Kernel'' ''Kernel.V3-dtl.1319'' ''18bad077-f877-4b68-bcfd-04716bdd807d'') + dependency (''Compiler'' ''Compiler.V3-dtl.419'' ''353d296d-24a6-49f2-9b44-e8f8e216ec35'') + dependency (''Collections'' ''Collections.V3-dtl.882'' ''9c3d454c-d010-49b7-b52d-c82a89ad9c71'') + dependency (''Monticello'' ''Monticello-nice.716'' ''a1f8545a-b4f8-4bae-b349-e8bbba23816e'') + dependency (''Files'' ''Files-pre.183'' ''c7d0c859-2531-464e-87d8-3b580249731b'') + dependency (''Sound'' ''Sound-dtl.68'' ''c7b5a141-2b1b-4d24-ab88-0a96dd78600b'') + mcmVersion ''2'' + id ''891fc3c1-a046-4f61-81f3-49444f8d7906'' + authorInitials ''dtl'' + timeStamp ''2020-04-10T15:00:06.887746-04:00'' + comment ''A comment describing this version of the configuration map'' + ) + ' + ! Item was added: + ----- Method: MCConfigurationTest>>sampleMcmFileContentsWithHistory (in category 'running') ----- + sampleMcmFileContentsWithHistory + "Contents of an MCM file with multiple repositories and dependencies and two + prior versions in its history." + + "MCConfigurationTest new sampleMcmFileContentsWithHistory" + + ^ '( + name ''update.V3-dtl.464'' + repository (''http://source.squeak.org/trunk'') + repository (''http://www.squeaksource.com/TrunkUpdateStreamV3'') + dependency (''Kernel'' ''Kernel.V3-dtl.1319'' ''18bad077-f877-4b68-bcfd-04716bdd807d'') + dependency (''Compiler'' ''Compiler.V3-dtl.419'' ''353d296d-24a6-49f2-9b44-e8f8e216ec35'') + dependency (''Collections'' ''Collections.V3-dtl.882'' ''9c3d454c-d010-49b7-b52d-c82a89ad9c71'') + dependency (''Monticello'' ''Monticello-nice.716'' ''a1f8545a-b4f8-4bae-b349-e8bbba23816e'') + dependency (''Files'' ''Files-pre.183'' ''c7d0c859-2531-464e-87d8-3b580249731b'') + dependency (''Sound'' ''Sound-dtl.68'' ''c7b5a141-2b1b-4d24-ab88-0a96dd78600b'') + mcmVersion ''2'' + id ''891fc3c1-a046-4f61-81f3-49444f8d7906'' + authorInitials ''dtl'' + timeStamp ''2020-04-10T15:00:06-04:00'' + comment ''A comment describing this version of the configuration map'' + Xname ''update.V3-dtl.464'' + Xrepository (''http://source.squeak.org/trunk'') + Xrepository (''http://www.squeaksource.com/TrunkUpdateStreamV3'') + Xdependency (''Kernel'' ''Kernel.V3-dtl.1319'' ''18bad077-f877-4b68-bcfd-04716bdd807d'') + Xdependency (''Compiler'' ''Compiler.V3-dtl.419'' ''353d296d-24a6-49f2-9b44-e8f8e216ec35'') + Xdependency (''Collections'' ''Collections.V3-dtl.882'' ''9c3d454c-d010-49b7-b52d-c82a89ad9c71'') + Xdependency (''Monticello'' ''Monticello-nice.716'' ''a1f8545a-b4f8-4bae-b349-e8bbba23816e'') + Xdependency (''Files'' ''Files-pre.183'' ''c7d0c859-2531-464e-87d8-3b580249731b'') + Xdependency (''Sound'' ''Sound-dtl.68'' ''9c3d454c-d010-49b7-b52d-c82a89ad9c71'') + XmcmVersion ''2'' + Xid ''d5bf283d-56f9-462d-9434-5cd8f074ab6d'' + XauthorInitials ''dtl'' + XtimeStamp ''2020-04-10T15:00:08.887746-04:00'' + Xcomment ''A comment describing the prior version of the configuration map'' + Xname ''update.V3-dtl.464'' + Xrepository (''http://source.squeak.org/trunk'') + Xrepository (''http://www.squeaksource.com/TrunkUpdateStreamV3'') + Xdependency (''Kernel'' ''Kernel.V3-dtl.1319'' ''18bad077-f877-4b68-bcfd-04716bdd807d'') + Xdependency (''Compiler'' ''Compiler.V3-dtl.419'' ''353d296d-24a6-49f2-9b44-e8f8e216ec35'') + Xdependency (''Collections'' ''Collections.V3-dtl.882'' ''9c3d454c-d010-49b7-b52d-c82a89ad9c71'') + Xdependency (''Monticello'' ''Monticello-nice.716'' ''a1f8545a-b4f8-4bae-b349-e8bbba23816e'') + Xdependency (''Files'' ''Files-pre.183'' ''c7d0c859-2531-464e-87d8-3b580249731b'') + Xdependency (''Sound'' ''Sound-dtl.68'' ''c7b5a141-2b1b-4d24-ab88-0a96dd78600b'') + ) + '! Item was added: + ----- Method: MCConfigurationTest>>sampleMcmStorageArray (in category 'running') ----- + sampleMcmStorageArray + "Array scanned from an MCM file with multiple repositories and dependencies in + the original MCM file storage format" + + "MCConfigurationTest new sampleMcmStorageArray" + + ^ #(#name 'update.V3-dtl.464' #repository #('http://source.squeak.org/trunk') #repository #('http://www.squeaksource.com/TrunkUpdateStreamV3') #dependency #('Kernel' 'Kernel.V3-dtl.1319' '18bad077-f877-4b68-bcfd-04716bdd807d') #dependency #('Compiler' 'Compiler.V3-dtl.419' '353d296d-24a6-49f2-9b44-e8f8e216ec35') #dependency #('Collections' 'Collections.V3-dtl.882' '9c3d454c-d010-49b7-b52d-c82a89ad9c71') #dependency #('Monticello' 'Monticello-nice.716' 'a1f8545a-b4f8-4bae-b349-e8bbba23816e') #dependency #('Files' 'Files-pre.183' 'c7d0c859-2531-464e-87d8-3b580249731b') #dependency #('Sound' 'Sound-dtl.68' 'c7b5a141-2b1b-4d24-ab88-0a96dd78600b'))! Item was added: + ----- Method: MCConfigurationTest>>sampleMcmStorageArrayExtended (in category 'running') ----- + sampleMcmStorageArrayExtended + "An extended format MCM array with no prior versions" + + "MCConfigurationTest new sampleMcmStorageArrayExtended" + + ^ self sampleMcmStorageArray, + # ( #mcmVersion '2' + #id '891fc3c1-a046-4f61-81f3-49444f8d7906' + #authorInitials 'dtl' + #timeStamp '2020-04-10T15:00:06.887746-04:00' + #comment 'A comment describing this version of the configuration map' ) + ! Item was added: + ----- Method: MCConfigurationTest>>setUp (in category 'running') ----- + setUp + + sampleMcmStorageArray := self sampleMcmStorageArray. + sampleMcmFileContents := self sampleMcmFileContents. + sampleMcmStorageArrayExtended := self sampleMcmStorageArrayExtended. + sampleMcmFileContentsExtended := self sampleMcmFileContentsExtended. + sampleMcmFileContentsWithHistory := self sampleMcmFileContentsWithHistory. + ! Item was added: + ----- Method: MCConfigurationTest>>testCopyForEditForBasic (in category 'tests - basic format') ----- + testCopyForEditForBasic + + | array mcm forEdit | + array := MCScanner scan: sampleMcmFileContents readStream. + mcm := MCConfiguration fromArray: array. + self assert: MCConfiguration equals: mcm class. + forEdit := mcm copyForEdit. + self assert: MCConfigurationExtended equals: forEdit class. + self assert: 'update.V3-dtl.464' equals: forEdit name. + self assert: 2 equals: forEdit repositories size. + self assert: 6 equals: forEdit dependencies size. + self assert: (forEdit instVarNamed: #log) isNil. + self assert: '2' equals: forEdit mcmVersion. + self assert: forEdit authorInitials isNil. + self assert: forEdit timeStamp isNil. + self assert: forEdit comment isNil. + self assert: 1 equals: forEdit priorVersions size. + self assert: forEdit priorVersions first == mcm. + ! Item was added: + ----- Method: MCConfigurationTest>>testCopyForEditForExtended (in category 'tests - extended format') ----- + testCopyForEditForExtended + + | input array mcm forEdit | + input := sampleMcmFileContentsWithHistory. + array := MCScanner scan: input readStream. + mcm := MCConfiguration fromArray: array. + self assert: MCConfigurationExtended equals: mcm class. + forEdit := mcm copyForEdit. + self assert: MCConfigurationExtended equals: forEdit class. + self assert: 'update.V3-dtl.464' equals: forEdit name. + self assert: 2 equals: forEdit repositories size. + self assert: 6 equals: forEdit dependencies size. + self assert: (forEdit instVarNamed: #log) isNil. + self assert: '2' equals: forEdit mcmVersion. + self assert: forEdit authorInitials isNil. "to be set when saved" + self assert: forEdit timeStamp isNil. "to be set when saved" + self assert: mcm comment equals: forEdit comment. "assume user may want to edit existing comment" + self assert: 3 equals: forEdit priorVersions size. + self assert: forEdit priorVersions first == mcm. + ! Item was added: + ----- Method: MCConfigurationTest>>testExtendedFromArray (in category 'tests - extended format') ----- + testExtendedFromArray + + | mcm | + mcm := MCConfiguration fromArray: sampleMcmStorageArrayExtended. + self assert: MCConfigurationExtended equals: mcm class. + self assert: 'update.V3-dtl.464' equals: mcm name. + self assert: 2 equals: mcm repositories size. + self assert: 6 equals: mcm dependencies size. + self assert: (mcm instVarNamed: #log) isNil. + self assert: '2' equals: mcm mcmVersion. + self assert: 'dtl' equals: mcm authorInitials. + self assert: '2020-04-10T15:00:06.887746-04:00' equals: mcm timeStamp. + self assert: 'A comment describing this version of the configuration map' equals: mcm comment. + self assert: mcm priorVersions isEmpty. + ! Item was added: + ----- Method: MCConfigurationTest>>testExtendedFromStorageString (in category 'tests - extended format') ----- + testExtendedFromStorageString + + | array mcm | + array := MCScanner scan: sampleMcmFileContentsExtended readStream. + mcm := MCConfiguration fromArray: array. + self assert: MCConfigurationExtended equals: mcm class. + self assert: 'update.V3-dtl.464' equals: mcm name. + self assert: 2 equals: mcm repositories size. + self assert: 6 equals: mcm dependencies size. + self assert: (mcm instVarNamed: #log) isNil. + self assert: '2' equals: mcm mcmVersion. + self assert: 'dtl' equals: mcm authorInitials. + self assert: '2020-04-10T15:00:06.887746-04:00' equals: mcm timeStamp. + self assert: 'A comment describing this version of the configuration map' equals: mcm comment. + self assert: mcm priorVersions isEmpty. + ! Item was added: + ----- Method: MCConfigurationTest>>testExtendedToStorageString (in category 'tests - extended format') ----- + testExtendedToStorageString + + | mcm strm | + mcm := MCConfiguration fromArray: sampleMcmStorageArrayExtended. + self assert: MCConfigurationExtended equals: mcm class. + strm := '' writeStream. + MCMcmWriter fileOut: mcm on: strm. + strm cr. "trailing line terminator matches sample string" + self assert: sampleMcmFileContentsExtended equals: strm contents. + ! Item was added: + ----- Method: MCConfigurationTest>>testExtendedToStorageStringWithHistory (in category 'tests - extended format') ----- + testExtendedToStorageStringWithHistory + + | input array mcm strm | + input := sampleMcmFileContentsWithHistory. + array := MCScanner scan: input readStream. + mcm := MCConfiguration fromArray: array. + self assert: MCConfigurationExtended equals: mcm class. + strm := '' writeStream. + MCMcmWriter fileOut: mcm on: strm. + strm cr. "trailing line terminator matches sample string" + self assert: sampleMcmFileContentsWithHistory equals: strm contents. + ! Item was added: + ----- Method: MCConfigurationTest>>testFromArray (in category 'tests - basic format') ----- + testFromArray + + | mcm | + mcm := MCConfiguration fromArray: sampleMcmStorageArray. + self assert: MCConfiguration equals: mcm class. + self assert: 'update.V3-dtl.464' equals: mcm name. + self assert: 2 equals: mcm repositories size. + self assert: 6 equals: mcm dependencies size. + self assert: (mcm instVarNamed: #log) isNil. + ! Item was added: + ----- Method: MCConfigurationTest>>testFromExtendedArray (in category 'tests - backward compatability') ----- + testFromExtendedArray + "Ensure backward compatibility" + | mcm | + mcm := MCConfiguration oldVersionOfFromArray: sampleMcmStorageArrayExtended. + self assert: MCConfiguration equals: mcm class. + self assert: 'update.V3-dtl.464' equals: mcm name. + self assert: 2 equals: mcm repositories size. + self assert: 6 equals: mcm dependencies size. + self assert: (mcm instVarNamed: #log) isNil. + ! Item was added: + ----- Method: MCConfigurationTest>>testFromExtendedStorageString (in category 'tests - backward compatability') ----- + testFromExtendedStorageString + "Ensure backward compatibility" + | array mcm | + array := MCScanner scan: sampleMcmFileContentsWithHistory readStream. + mcm := MCConfiguration oldVersionOfFromArray: array. + self assert: MCConfiguration equals: mcm class. + self assert: 'update.V3-dtl.464' equals: mcm name. + self assert: 2 equals: mcm repositories size. + self assert: 6 equals: mcm dependencies size. + self assert: (mcm instVarNamed: #log) isNil. + ! Item was added: + ----- Method: MCConfigurationTest>>testFromStorageString (in category 'tests - basic format') ----- + testFromStorageString + + | array mcm | + array := MCScanner scan: sampleMcmFileContents readStream. + mcm := MCConfiguration fromArray: array. + self assert: MCConfiguration equals: mcm class. + self assert: 'update.V3-dtl.464' equals: mcm name. + self assert: 2 equals: mcm repositories size. + self assert: 6 equals: mcm dependencies size. + self assert: (mcm instVarNamed: #log) isNil. + ! Item was added: + ----- Method: MCConfigurationTest>>testToStorageString (in category 'tests - basic format') ----- + testToStorageString + + | mcm strm | + mcm := MCConfiguration fromArray: sampleMcmStorageArray. + self assert: MCConfiguration equals: mcm class. + strm := '' writeStream. + MCMcmWriter fileOut: mcm on: strm. + strm cr. "trailing line terminator matches sample string" + self assert: sampleMcmFileContents equals: strm contents. + ! Item was added: + ----- Method: MCConfigurationTest>>testVersionHistory (in category 'tests - extended format') ----- + testVersionHistory + "Each instance of MCConfigurationExtended has a possibly empty list of prior + versions. Rather than modifying an instance of a configuration, the prior + instance can be saved in the history list, with the current version saved as + a new instance with history." + + | array mcm firstVersion thirdVersion secondVersion | + mcm := MCConfiguration fromArray: sampleMcmStorageArrayExtended. + self assert: mcm priorVersions isEmpty. + array := sampleMcmStorageArrayExtended, "current version" + sampleMcmStorageArrayExtended, "prior version" + sampleMcmStorageArrayExtended, + sampleMcmStorageArray. "oldest (original) version" + mcm := MCConfiguration fromArray: array. + + self assert: 3 equals: mcm priorVersions size. + firstVersion := MCConfiguration fromArray: sampleMcmStorageArray. + self assert: firstVersion equals: mcm priorVersions last. + + secondVersion := mcm priorVersions second. + self assert: 1 equals: secondVersion priorVersions size. + self assert: firstVersion equals: secondVersion priorVersions first. + + thirdVersion := mcm priorVersions first. + self assert: 2 equals: thirdVersion priorVersions size. + self assert: secondVersion equals: thirdVersion priorVersions first. + self assert: firstVersion equals: thirdVersion priorVersions second. + !

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages May 2020