Begin forwarded message:
From: commits@source.squeak.org Date: August 27, 2009 5:43:57 AM CEDT To: squeak-dev@lists.squeakfoundation.org Subject: [squeak-dev] The Trunk: Kernel-ar.229.mcz Reply-To: squeak-dev@lists.squeakfoundation.org
Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.229.mcz
==================== Summary ====================
Name: Kernel-ar.229 Author: ar Time: 26 August 2009, 8:42:37 am UUID: fad5617c-3a41-4c4e-80af-d8b2234cca10 Ancestors: Kernel-dtl.226, Kernel-djr.228
Merging Kernel-djr.228:
CompiledMethod>>= seems to be broken. Attempt to fix it.
MethodProperties>>analogousCodeTo: calls Pragma>>analogousCodeTo: which does not exist.
Further assume when both properties are nil and both pragmas are empty, its equal.
=============== Diff against Kernel-dtl.226 ===============
Item was changed: ----- Method: MethodProperties>>analogousCodeTo: (in category 'testing') ----- analogousCodeTo: aMethodProperties pragmas ifNil: [aMethodProperties pragmas notEmpty ifTrue: [^false]] ifNotNil: + [pragmas size ~= aMethodProperties pragmas size ifTrue: - [aMethodProperties pragmas isEmpty ifTrue: [^false]. - pragmas size ~= aMethodProperties pragmas size ifTrue: [^false]. pragmas with: aMethodProperties pragmas do: [:mine :others| (mine analogousCodeTo: others) ifFalse: [^false]]]. + (self propertiesIsNil and: [aMethodProperties propertiesIsNil]) ifTrue: [^true]. ^(self hasAtLeastTheSamePropertiesAs: aMethodProperties) and: [aMethodProperties hasAtLeastTheSamePropertiesAs: self]!
Item was added: + ----- Method: MethodProperties>>propertiesIsNil (in category 'testing') ----- + propertiesIsNil + ^ properties isNil!
Item was added: + ----- Method: MethodProperties>>keysAndValuesDo: (in category 'accessing') ----- + keysAndValuesDo: aBlock + properties keysAndValuesDo: aBlock!
Item was added: + ----- Method: Pragma>>analogousCodeTo: (in category 'testing') ----- + analogousCodeTo: aPragma + ^ (self arguments = aPragma arguments) & + (self keyword = aPragma keyword)!