Squeak-dev April 2010

squeak-dev@lists.squeakfoundation.org

122 participants
595 discussions

The Trunk: System-ar.307.mcz
by commits＠source.squeak.org 01 Apr '10

01 Apr '10

Andreas Raab uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-ar.307.mcz ==================== Summary ==================== Name: System-ar.307 Author: ar Time: 31 March 2010, 11:17:35.995 pm UUID: d272ac32-bc34-f24f-86e0-11acd6af0ba2 Ancestors: System-ul.306 Adds a new condensing method. Smalltalk appendChangesTo: 'myfile.sources' will copy the original sources file and append a condensed version of the changes. These later versions are linked to the earlier ones so that the 'versions' of some method show its ancestry in the sources file. This gives us the ability to preserve the 'shipped' ancestry of methods while avoiding all the intermediate versions during development. Also bullet-proofs ChangeSet>>scanVersionsOf: in the case of broken preambles. =============== Diff against System-ul.306 =============== Item was added: + ----- Method: SmalltalkImage>>appendChangesTo: (in category 'housekeeping') ----- + appendChangesTo: sourcesName + + "Condense changes to the end of the given sources file. + If the file is the same as Smalltalk sourcesName, then just append + the changes. If the file is different, then copy the sources file and + append the changes afterwards." + + "Smalltalk appendChangesTo: 'test123.sources'" + + "To verify correctness of the operation run the following code: + [ | sourceMap | + sourceMap := Dictionary new. + + (CompiledMethod allInstances select:[:cm| cm isInstalled]) do:[:cm| + sourceMap at: cm methodReference put: + (cm getSourceFor: cm selector in: cm methodClass)]. + Smalltalk allClassesAndTraitsDo:[:aClass| + sourceMap at: aClass put: aClass comment]. + + Smalltalk appendChangesTo: 'verify.sources'. + + (CompiledMethod allInstances select:[:cm| cm isInstalled]) do:[:cm| + self assert: (sourceMap at: cm methodReference) = + (cm getSourceFor: cm selector in: cm methodClass)]. + Smalltalk allClassesAndTraitsDo:[:aClass| + self assert: (sourceMap at: aClass) = aClass comment]. + ]" + + | fullName sourcesFile | + fullName := FileDirectory default fullNameFor: sourcesName. + (fullName endsWith: '.sources') ifFalse:[self error: 'New name must end with .sources']. + fullName = Smalltalk sourcesName ifFalse:[ + "Copy sources file; change file name accordingly" + FileStream forceNewFileNamed: fullName do:[:newFile| | bufSize | + bufSize := 16r10000. + sourcesFile := (SourceFiles at: 1) readOnlyCopy. + sourcesFile position: 0. + 'Copying sources...' displayProgressAt: Sensor cursorPoint + from: 0 to: sourcesFile size during:[:bar| + [sourcesFile atEnd] whileFalse:[ + bar value: sourcesFile position. + newFile nextPutAll: (sourcesFile next: bufSize)]]. + newFile position = sourcesFile size ifFalse:[self error: 'File copy failed']. + ]. + self setMacFileInfoOn: fullName. + "Change to the new sources file and reopen" + self closeSourceFiles. + SourceFileVersionString := (FileDirectory localNameFor: fullName) + allButLast: '.sources' size. + self openSourceFiles. + ]. + + "We've copied the old to the new sources file; reopen the sources file read/write" + sourcesFile := SourceFiles at: 1. + sourcesFile close; open: sourcesFile fullName forWrite: true. "should be openReadWrite" + sourcesFile timeStamp. "remember when we did this" + + "Copy method sources from changes to sources" + CompiledMethod allInstances do:[:method| + (method isInstalled and:[method fileIndex = 2]) ifTrue:[ + | class selector category preamble changeList index chgRec string source | + class := method methodClass. + selector := method selector. + source := class sourceCodeAt: selector. + category := class organization categoryOfElement: selector. + preamble := class name, ' methodsFor: ', category asString printString, + ' stamp: ', method timeStamp printString. + + "Find the last version in the sources file; link up the prior: version" + changeList := ChangeSet scanVersionsOf: method + class: class meta: class isMeta category: category selector: selector. + index := changeList findLast:[:any| any fileIndex = 1]. + index > 0 ifTrue:[ + chgRec := changeList at: index. + preamble := preamble, ' prior: ', (SourceFiles + sourcePointerFromFileIndex: chgRec fileIndex + andPosition: chgRec position) printString]. + + "append to sources file" + sourcesFile setToEnd; cr; nextPut: $!!; nextChunkPut: preamble; cr. + string := RemoteString newString: source onFileNumber: 1 toFile: sourcesFile. + sourcesFile nextChunkPut: ' '. + method setSourcePosition: string position inFile: 1 + ]. + ] displayingProgress: 'Moving changes...'. + + "Copy class comments from changes to sources" + self allClassesAndTraitsDo: [:classOrTrait | + classOrTrait moveClassCommentTo: sourcesFile fileIndex: 1. + ]. + + "We've moved everything; reopen the source files" + self closeSourceFiles; openSourceFiles. + + "Finally, run condenseChanges -- they *should* be empty + but it's better to be safe than sorry" + self condenseChanges. + ! Item was changed: ----- Method: ChangeSet class>>scanVersionsOf:class:meta:category:selector: (in category 'scanning') ----- scanVersionsOf: method class: class meta: meta category: cat selector: selector | position prevPos prevFileIndex preamble tokens sourceFilesCopy stamp changeList file | changeList := OrderedCollection new. position := method filePosition. sourceFilesCopy := SourceFiles collect:[:x | x ifNotNil:[x readOnlyCopy]]. method fileIndex == 0 ifTrue: [^ nil]. file := sourceFilesCopy at: method fileIndex. [position notNil & file notNil] whileTrue:[ preamble := method getPreambleFrom: file at: (0 max: position - 3). "Preamble is likely a linked method preamble, if we're in a changes file (not the sources file). Try to parse it for prior source position and file index" prevPos := nil. stamp := ''. (preamble findString: 'methodsFor:' startingAt: 1) > 0 + ifTrue: [tokens := [Scanner new scanTokens: preamble] on: Error do:[#()]] - ifTrue: [tokens := Scanner new scanTokens: preamble] ifFalse: [tokens := Array new "ie cant be back ref"]. ((tokens size between: 7 and: 8) and: [(tokens at: tokens size-5) = #methodsFor:]) ifTrue:[ (tokens at: tokens size-3) = #stamp: ifTrue:[ "New format gives change stamp and unified prior pointer" stamp := tokens at: tokens size-2. prevPos := tokens last. prevFileIndex := sourceFilesCopy fileIndexFromSourcePointer: prevPos. prevPos := sourceFilesCopy filePositionFromSourcePointer: prevPos. ] ifFalse: ["Old format gives no stamp; prior pointer in two parts" prevPos := tokens at: tokens size-2. prevFileIndex := tokens last. ]. (prevPos = 0 or: [prevFileIndex = 0]) ifTrue: [prevPos := nil] ]. ((tokens size between: 5 and: 6) and: [(tokens at: tokens size-3) = #methodsFor:]) ifTrue:[ (tokens at: tokens size-1) = #stamp: ifTrue: [ "New format gives change stamp and unified prior pointer" stamp := tokens at: tokens size. ] ]. changeList add: (ChangeRecord new file: file position: position type: #method class: class name category: cat meta: meta stamp: stamp). position := prevPos. prevPos notNil ifTrue:[file := sourceFilesCopy at: prevFileIndex]. ]. sourceFilesCopy do: [:x | x ifNotNil:[x close]]. ^changeList!

1 0

The Trunk: Kernel-ar.437.mcz
by commits＠source.squeak.org 01 Apr '10

01 Apr '10

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.437.mcz ==================== Summary ==================== Name: Kernel-ar.437 Author: ar Time: 31 March 2010, 11:12:42.404 pm UUID: fca21cc5-5dcb-e24d-af15-a1bf0241151d Ancestors: Kernel-ar.436 Fixes needed for new condensing method: * Allow class comments to be moved to the sources file * Make CompiledMethod>>setSourcePointer: less expensive by avoiding #become: if at all possible =============== Diff against Kernel-ar.436 =============== Item was changed: ----- Method: ClassDescription>>putClassCommentToCondensedChangesFile: (in category 'fileIn/Out') ----- putClassCommentToCondensedChangesFile: aFileStream "Called when condensing changes. If the receiver has a class comment, and if that class comment does not reside in the .sources file, then write it to the given filestream, with the resulting RemoteString being reachable from the source file #2. Note that any existing backpointer into the .sources file is lost by this process -- a situation that maybe should be fixed someday." + ^self moveClassCommentTo: aFileStream fileIndex: 2! - - | header aStamp aCommentRemoteStr | - self isMeta ifTrue: [^ self]. "bulletproofing only" - ((aCommentRemoteStr := self organization commentRemoteStr) isNil or: - [aCommentRemoteStr sourceFileNumber == 1]) ifTrue: [^ self]. - - aFileStream cr; nextPut: $!!. - header := String streamContents: [:strm | strm nextPutAll: self name; - nextPutAll: ' commentStamp: '. - (aStamp := self organization commentStamp ifNil: ['<historical>']) storeOn: strm. - strm nextPutAll: ' prior: 0']. - aFileStream nextChunkPut: header. - aFileStream cr. - self organization classComment: (RemoteString newString: self organization classComment onFileNumber: 2 toFile: aFileStream) stamp: aStamp! Item was added: + ----- Method: ClassDescription>>moveClassCommentTo:fileIndex: (in category 'fileIn/Out') ----- + moveClassCommentTo: aFileStream fileIndex: newFileIndex + "Called when condensing changes. If the receiver has a class comment, and if that class comment does not reside in the .sources file, then write it to the given filestream, with the resulting RemoteString being reachable from the source file fileIndex. Note that any existing backpointer into the .sources file is lost by this process -- a situation that maybe should be fixed someday." + + | header aStamp aCommentRemoteStr | + self isMeta ifTrue: [^ self]. "bulletproofing only" + ((aCommentRemoteStr := self organization commentRemoteStr) isNil or: + [aCommentRemoteStr sourceFileNumber == 1]) ifTrue: [^ self]. + + aFileStream cr; nextPut: $!!. + header := String streamContents: [:strm | strm nextPutAll: self name; + nextPutAll: ' commentStamp: '. + (aStamp := self organization commentStamp ifNil: ['<historical>']) storeOn: strm. + strm nextPutAll: ' prior: 0']. + aFileStream nextChunkPut: header. + aFileStream cr. + self organization classComment: (RemoteString newString: self organization classComment onFileNumber: newFileIndex toFile: aFileStream) stamp: aStamp! Item was changed: ----- Method: CompiledMethod>>setSourcePointer: (in category 'source code management') ----- setSourcePointer: srcPointer "We can't change the trailer of existing method, since it could have completely different format. Therefore we need to generate a copy with new trailer, containing an scrPointer, and then #become it" + | trailer copy start | - | trailer copy | trailer := CompiledMethodTrailer new sourcePointer: srcPointer. copy := self copyWithTrailerBytes: trailer. + + "ar 3/31/2010: Be a bit more clever since #become: is slow. + If the old and the new trailer have the same size, just replace it." + (self trailer class == trailer class and:[self size = copy size]) ifTrue:[ + start := self endPC + 1. + self replaceFrom: start to: self size with: copy startingAt: start. + ] ifFalse:[self becomeForward: copy]. + + ^self "will be copy if #become was needed" + ! - self becomeForward: copy. - ^ copy!

1 0

The Trunk: Collections-ar.353.mcz
by commits＠source.squeak.org 01 Apr '10

01 Apr '10

Andreas Raab uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ar.353.mcz ==================== Summary ==================== Name: Collections-ar.353 Author: ar Time: 31 March 2010, 10:11:07.876 pm UUID: 4ea0e395-ea15-b348-8053-a7d27929e745 Ancestors: Collections-nice.352 Fix do:displayingProgress: to suppress changing the label to nil if the display block returns nil (accidentally or deliberately). =============== Diff against Collections-nice.352 =============== Item was changed: ----- Method: Collection>>do:displayingProgress:every: (in category 'enumerating') ----- do: aBlock displayingProgress: aStringOrBlock every: msecs "Enumerate aBlock displaying progress information. If the argument is a string, use a static label for the process. If the argument is a block, evaluate it with the element to retrieve the label. The msecs argument ensures that updates happen at most every msecs. Example: Smalltalk allClasses do:[:aClass| (Delay forMilliseconds: 1) wait] displayingProgress:[:aClass| 'Processing ', aClass name] every: 0. Smalltalk allClasses do:[:aClass| (Delay forMilliseconds: 1) wait] displayingProgress:[:aClass| 'Processing ', aClass name] every: 100. " | size labelBlock count oldLabel lastUpdate | labelBlock := aStringOrBlock isString ifTrue:[[:item| aStringOrBlock]] ifFalse:[aStringOrBlock]. oldLabel := nil. count := lastUpdate := 0. size := self size. '' displayProgressAt: Sensor cursorPoint from: 0 to: size during:[:bar | self do:[:each| | newLabel | "Special handling for first and last element" (count = 0 or:[count+1 = size or:[(Time millisecondsSince: lastUpdate) >= msecs]]) ifTrue:[ bar value: count. + oldLabel = (newLabel := (labelBlock value: each) ifNil:[oldLabel]) ifFalse:[ - oldLabel = (newLabel := labelBlock value: each) ifFalse:[ ProgressNotification signal: '' extra: (oldLabel := newLabel). ]. lastUpdate := Time millisecondClockValue. ]. aBlock value: each. count := count + 1. ]]!

1 0

Re: [squeak-dev] The Inbox: Morphic-djr.406.mcz
by Danie Roux 01 Apr '10

01 Apr '10

> Implement some methods to make Lukas' OmniBrowser tests pass. This commit makes me feel dirty :-) Without this, 50+ tests fail in the latest from http://source.lukas-renggli.ch/ob With this (and some other, real fixes), all of them pass. Any suggestions how best to approach this? -- Danie Roux *shuffle* Adore Unix - http://danieroux.com

3 2

Re: The Inbox: System-djr.305.mcz
by Andreas Raab 01 Apr '10

01 Apr '10

On 3/31/2010 1:46 PM, commits(a)source.squeak.org wrote: > ==================== Summary ==================== > > Name: System-djr.305 > Author: djr > Time: 31 March 2010, 2:54:59.346 pm > UUID: 1bfe21fc-f91f-4769-b467-52cc2af8069a > Ancestors: System-ar.304 > > Move (and delegate) Smalltalk>>hasSpecialSelector:ifTrueSetByte: and friends to SystemDictionary. > > The Refactoring Browser' tests expects it there and it makes more sense to me. Sorry, but that's a no-go. Special selectors and special objects are a system-wide facility not associated with an individual namespace like Smalltalk globals. If the RefactoringBrowser looks for these facilities in a namespace then it is broken and should be fixed. If a compatibility layer is needed then it should delegate the other way around, i.e., from SystemDictionary to SmalltalkImage. Feel free to add these methods in the 311Deprecated package with a comment noting that RB relies on those. Cheers, - Andreas

3 2

Jump to page: