Squeak-dev April 2012

squeak-dev@lists.squeakfoundation.org

56 participants
149 discussions

The Trunk: Tools-bf.403.mcz
by commits＠source.squeak.org 20 Apr '12

20 Apr '12

Bert Freudenberg uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-bf.403.mcz ==================== Summary ==================== Name: Tools-bf.403 Author: bf Time: 19 April 2012, 6:26:28.218 pm UUID: c5cae588-b172-4455-98ab-30c91e6043f8 Ancestors: Tools-eem.402 When manually recategorizing a method, make an entry in the changes file. Otherwise the methpd's latest change record in the changes file will not match what's in the image, confusing Monticello. =============== Diff against Tools-eem.402 =============== Item was changed: ----- Method: Browser>>dropOnMessageCategories:at: (in category 'drag and drop') ----- dropOnMessageCategories: method at: index | dstClass category copy | copy := Sensor shiftPressed. (method isKindOf: CompiledMethod) ifFalse:[^self inform: 'Can only drop methods']. dstClass := self selectedClassOrMetaClass. (dstClass == method methodClass) ifTrue:[ category := self messageCategoryList at: index. category = ClassOrganizer allCategory ifTrue: [^false]. + dstClass organization classify: method selector under: category suppressIfDefault: false logged: true. - dstClass organization classify: method selector under: category suppressIfDefault: false. ^true]. copy ifFalse: [ (self confirm: ( 'Classes {1} and {2} are unrelated.{3}Are you sure you want to move this method?' format: { method methodClass. dstClass. Character cr })) ifFalse: [ ^false ] ]. dstClass compile: method getSource classified: (self messageCategoryList at: index) withStamp: method timeStamp notifying: nil. copy ifFalse: [ method methodClass removeSelector: method selector ]. ^true! Item was changed: ----- Method: Browser>>recategorizeMethodSelector: (in category 'message category list') ----- recategorizeMethodSelector: sel "Categorize method named sel by looking in parent classes for a method category. Answer true if recategorized." self selectedClassOrMetaClass allSuperclasses do: [:ea | | thisCat | thisCat := ea organization categoryOfElement: sel. (thisCat ~= ClassOrganizer default and: [thisCat notNil]) + ifTrue: [self classOrMetaClassOrganizer classify: sel under: thisCat logged: true. - ifTrue: [self classOrMetaClassOrganizer classify: sel under: thisCat. self changed: #messageCategoryList. ^ true]]. ^ false! Item was changed: ----- Method: CodeHolder>>letUserReclassify:in: (in category 'categories') ----- letUserReclassify: anElement in: aClass "Put up a list of categories and solicit one from the user. Answer true if user indeed made a change, else false" | currentCat newCat | currentCat := aClass organization categoryOfElement: anElement. newCat := self categoryFromUserWithPrompt: 'choose category (currently "', currentCat, '")' for: aClass. (newCat ~~ nil and: [newCat ~= currentCat]) ifTrue: + [aClass organization classify: anElement under: newCat suppressIfDefault: false logged: true. - [aClass organization classify: anElement under: newCat suppressIfDefault: false. ^ true] ifFalse: [^ false]!

1 0

The Trunk: Kernel-bf.680.mcz
by commits＠source.squeak.org 20 Apr '12

20 Apr '12

Bert Freudenberg uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-bf.680.mcz ==================== Summary ==================== Name: Kernel-bf.680 Author: bf Time: 19 April 2012, 6:23:49.174 pm UUID: b7735cff-3ec1-47d5-9c49-6f054f21f317 Ancestors: Kernel-eem.679 When manually recategorizing a method, make an entry in the changes file. Otherwise the methpd's latest change record in the changes file will not match what's in the image, confusing Monticello. =============== Diff against Kernel-eem.679 =============== Item was added: + ----- Method: ClassOrganizer>>classify:under:logged: (in category 'accessing') ----- + classify: element under: heading logged: aBoolean + self classify: element under: heading suppressIfDefault: true logged: aBoolean + ! Item was added: + ----- Method: ClassOrganizer>>classify:under:suppressIfDefault:logged: (in category 'accessing') ----- + classify: element under: heading suppressIfDefault: aBoolean logged: logged + | oldCat newCat | + oldCat := self categoryOfElement: element. + SystemChangeNotifier uniqueInstance doSilently: [ + super classify: element under: heading suppressIfDefault: aBoolean]. + newCat := self categoryOfElement: element. + self notifyOfChangedSelector: element from: oldCat to: newCat. + logged ifTrue: [self logChangedSelector: element category: newCat]. + ! Item was added: + ----- Method: ClassOrganizer>>logChangedSelector:category: (in category 'private') ----- + logChangedSelector: element category: newCategory + "make an entry in the changes to record the changed category" + | method | + "if we do not have a changes file, the code below would try to make a new method" + (subject == nil or: [SourceFiles == nil or: [(SourceFiles at: 2) == nil]]) ifTrue: [^self]. + method := subject compiledMethodAt: element ifAbsent: [^self]. + subject logMethodSource: (method getSourceFor: element in: subject) + forMethodWithNode: (CompiledMethodWithNode method: method node: method) + inCategory: newCategory withStamp: method timeStamp notifying: nil. + ! Item was added: + ----- Method: ClassOrganizer>>logSelectorsInChangedCategory: (in category 'private') ----- + logSelectorsInChangedCategory: newCategory + "make an entry in the changes file for each method in the changed category" + (self listAtCategoryNamed: newCategory) do: [:element | + self logChangedSelector: element category: newCategory]. + ! Item was changed: ----- Method: ClassOrganizer>>renameCategory:toBe: (in category 'accessing') ----- renameCategory: oldCatString toBe: newCatString SystemChangeNotifier uniqueInstance doSilently: [super renameCategory: oldCatString toBe: newCatString]; + protocolRenamedFrom: oldCatString asSymbol to: newCatString asSymbol inClass: self subject. + self logSelectorsInChangedCategory: newCatString. + ! - protocolRenamedFrom: oldCatString asSymbol to: newCatString asSymbol inClass: self subject!

1 0

The Trunk: PackageInfo-Base-bf.60.mcz
by commits＠source.squeak.org 20 Apr '12

20 Apr '12

Bert Freudenberg uploaded a new version of PackageInfo-Base to project The Trunk: http://source.squeak.org/trunk/PackageInfo-Base-bf.60.mcz ==================== Summary ==================== Name: PackageInfo-Base-bf.60 Author: bf Time: 19 April 2012, 6:14:22.792 pm UUID: 5d2b1bd4-e647-4a86-aeb0-eb93b079ded2 Ancestors: PackageInfo-Base-bf.59 When looking up the change record for an overridden method, ignore all versions from the overriding package, to really get at the original method. (Amended: use category not method for lookup. And fix category inclusion test) =============== Diff against PackageInfo-Base-bf.59 =============== Item was changed: ----- Method: PackageInfo>>changeRecordForOverriddenMethod: (in category 'testing') ----- changeRecordForOverriddenMethod: aMethodReference | sourceFilesCopy method position overridingPackages | overridingPackages := Set new. + method := aMethodReference compiledMethod. - method := aMethodReference actualClass compiledMethodAt: aMethodReference methodSymbol. position := method filePosition. sourceFilesCopy := SourceFiles collect: [:x | x isNil ifTrue: [ nil ] ifFalse: [x readOnlyCopy]]. [ | file prevPos prevFileIndex chunk stamp methodCategory methodPackage tokens | method fileIndex = 0 ifTrue: [^ nil]. file := sourceFilesCopy at: method fileIndex. [position notNil & file notNil] whileTrue: [file position: (0 max: position-150). "Skip back to before the preamble" [file position < (position-1)] "then pick it up from the front" whileTrue: [chunk := file nextChunk]. "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 := ''. (chunk findString: 'methodsFor:' startingAt: 1) > 0 ifTrue: [tokens := Scanner new scanTokens: chunk] 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]]. methodCategory := tokens after: #methodsFor: ifAbsent: ['as yet unclassifed']. (self includesMethodCategory: methodCategory ofClass: aMethodReference actualClass) ifTrue: [methodCategory = (Smalltalk at: #Categorizer ifAbsent: [Smalltalk at: #ClassOrganizer]) default ifTrue: [methodCategory := methodCategory, ' ']. ^ ChangeRecord new file: file position: position type: #method class: aMethodReference classSymbol category: methodCategory meta: aMethodReference classIsMeta stamp: stamp]. + methodPackage := PackageOrganizer default packageOfMethodCategory: methodCategory ofClass: aMethodReference actualClass ifNone: [#unknown]. - methodPackage := PackageOrganizer default packageOfMethod: aMethodReference ifNone: [#unknown]. (self isOverrideCategory: methodCategory) ifTrue: [overridingPackages add: methodPackage] ifFalse: [(overridingPackages includes: methodPackage) ifFalse: [^nil]]. position := prevPos. prevPos notNil ifTrue: [file := sourceFilesCopy at: prevFileIndex]]. ^ nil] ensure: [sourceFilesCopy do: [:x | x notNil ifTrue: [x close]]] ! Item was changed: ----- Method: PackageOrganizer>>packageOfMethodCategory:ofClass:ifNone: (in category 'searching') ----- packageOfMethodCategory: categoryName ofClass: aClass ifNone: errorBlock + ^ self packages detect: [:ea | ea includesMethodCategory: categoryName ofClassNamed: aClass name] ifNone: errorBlock - ^ self packages detect: [:ea | ea includesMethodCategory: categoryName ofClassNamed: aClass] ifNone: errorBlock !

1 0

Re: [squeak-dev] The Trunk: Monticello-bf.504.mcz
by Nicolas Cellier 20 Apr '12

20 Apr '12

Ah thanks, very useful. I noticed the bug, suspected the origin but didn't had time to correct. Nicolas Le 19 avril 2012 18:36, <commits(a)source.squeak.org> a écrit : > Bert Freudenberg uploaded a new version of Monticello to project The Trunk: > http://source.squeak.org/trunk/Monticello-bf.504.mcz > > ==================== Summary ==================== > > Name: Monticello-bf.504 > Author: bf > Time: 19 April 2012, 9:36:55.211 am > UUID: 5fa1177d-b1ed-4cf0-8628-229f171ca814 > Ancestors: Monticello-eem.503 > > Fix intermittant load problem. We sometimes would get a 'changes file not found' in the middle of updating, but retrying found it just fine. I finally tracked it down to too many files being open. This change re-uses the same read-only copy during a package load (which additionally might speed up loading a tiny bit). > > =============== Diff against Monticello-eem.503 =============== > > Item was changed: > ----- Method: MCPackageLoader>>basicLoad (in category 'private') ----- > basicLoad > "Load the contents of some package. This is the core loading method > in Monticello. Be wary about modifying it unless you understand the details > and dependencies of the various entities being modified." > | pkgName | > errorDefinitions := OrderedCollection new. > "Obviously this isn't the package name but we don't have anything else > to use here. ChangeSet current name will generally work since a CS is > usually installed prior to installation." > pkgName := ChangeSet current name. > > + [CurrentReadOnlySourceFiles cacheDuring: [[ > + "Pass 1: Load everything but the methods, which are collected in methodAdditions." > - [["Pass 1: Load everything but the methods, which are collected in methodAdditions." > additions do: [:ea | > ea isMethodDefinition > ifTrue:[methodAdditions add: ea asMethodAddition] > ifFalse:[[ea load]on: Error do: [errorDefinitions add: ea]]. > ] displayingProgress: 'Reshaping ', pkgName. > > "Try again any delayed definitions" > self shouldWarnAboutErrors ifTrue: [self warnAboutErrors]. > errorDefinitions do: [:ea | ea load] > displayingProgress: 'Reloading ', pkgName. > > "Pass 2: We compile new / changed methods" > methodAdditions do:[:ea| ea createCompiledMethod] > displayingProgress: 'Compiling ', pkgName. > > 'Installing ', pkgName displayProgressFrom: 0 to: 2 during:[:bar| > "There is no progress *during* installation since a progress bar update > will redraw the world and potentially call methods that we're just trying to install." > bar value: 1. > > "Pass 3: Install the new / changed methods > (this is a separate pass to allow compiler changes to be loaded)" > methodAdditions do:[:ea| ea installMethod]. > > "Pass 4: Remove the obsolete methods" > removals do:[:ea| ea unload]. > ]. > > "Finally, notify observers for the method additions" > methodAdditions do: [:each | each notifyObservers] > "the message is fake but actually telling people how much time we spend > in the notifications is embarrassing so lie instead" > displayingProgress: 'Installing ', pkgName. > > additions do: [:ea | ea postloadOver: (self obsoletionFor: ea)] > displayingProgress: 'Initializing ', pkgName. > > ] on: InMidstOfFileinNotification do: [:n | n resume: true] > + ]] ensure: [self flushChangesFile]! > - ] ensure: [self flushChangesFile]! > >

4 3

Daily Commit Log
by commits＠source.squeak.org 20 Apr '12

20 Apr '12

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2012-April/005298.html Name: Monticello-bf.504 Ancestors: Monticello-eem.503 Fix intermittant load problem. We sometimes would get a 'changes file not found' in the middle of updating, but retrying found it just fine. I finally tracked it down to too many files being open. This change re-uses the same read-only copy during a package load (which additionally might speed up loading a tiny bit). ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-April/005299.html Name: PackageInfo-Base-bf.59 Ancestors: PackageInfo-Base-eem.58 When looking up the change record for an overridden method, ignore all versions from the overriding package, to really get at the original method. =============================================

1 0

The Trunk: PackageInfo-Base-bf.59.mcz
by commits＠source.squeak.org 20 Apr '12

20 Apr '12

Bert Freudenberg uploaded a new version of PackageInfo-Base to project The Trunk: http://source.squeak.org/trunk/PackageInfo-Base-bf.59.mcz ==================== Summary ==================== Name: PackageInfo-Base-bf.59 Author: bf Time: 19 April 2012, 4:10:33.317 pm UUID: a4c0a6e8-a83f-469d-ba3b-287687bc5d26 Ancestors: PackageInfo-Base-eem.58 When looking up the change record for an overridden method, ignore all versions from the overriding package, to really get at the original method. =============== Diff against PackageInfo-Base-eem.58 =============== Item was changed: ----- Method: PackageInfo>>changeRecordForOverriddenMethod: (in category 'testing') ----- changeRecordForOverriddenMethod: aMethodReference + | sourceFilesCopy method position overridingPackages | + overridingPackages := Set new. - | sourceFilesCopy method position | method := aMethodReference actualClass compiledMethodAt: aMethodReference methodSymbol. position := method filePosition. sourceFilesCopy := SourceFiles collect: [:x | x isNil ifTrue: [ nil ] ifFalse: [x readOnlyCopy]]. + [ | file prevPos prevFileIndex chunk stamp methodCategory methodPackage tokens | - [ | file prevPos prevFileIndex chunk stamp methodCategory tokens | method fileIndex = 0 ifTrue: [^ nil]. file := sourceFilesCopy at: method fileIndex. [position notNil & file notNil] whileTrue: [file position: (0 max: position-150). "Skip back to before the preamble" [file position < (position-1)] "then pick it up from the front" whileTrue: [chunk := file nextChunk]. "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 := ''. (chunk findString: 'methodsFor:' startingAt: 1) > 0 ifTrue: [tokens := Scanner new scanTokens: chunk] 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]]. methodCategory := tokens after: #methodsFor: ifAbsent: ['as yet unclassifed']. (self includesMethodCategory: methodCategory ofClass: aMethodReference actualClass) ifTrue: [methodCategory = (Smalltalk at: #Categorizer ifAbsent: [Smalltalk at: #ClassOrganizer]) default ifTrue: [methodCategory := methodCategory, ' ']. ^ ChangeRecord new file: file position: position type: #method class: aMethodReference classSymbol category: methodCategory meta: aMethodReference classIsMeta stamp: stamp]. + methodPackage := PackageOrganizer default packageOfMethod: aMethodReference ifNone: [#unknown]. + (self isOverrideCategory: methodCategory) + ifTrue: [overridingPackages add: methodPackage] + ifFalse: [(overridingPackages includes: methodPackage) + ifFalse: [^nil]]. - (self isOverrideCategory: methodCategory) ifFalse: [^nil]. position := prevPos. prevPos notNil ifTrue: [file := sourceFilesCopy at: prevFileIndex]]. ^ nil] ensure: [sourceFilesCopy do: [:x | x notNil ifTrue: [x close]]] !

1 0

ExtendedNumberParser
by Frank Shearar 19 Apr '12

19 Apr '12

Hi Nicolas, I was wondering about why we're using ExtendedNumberParser instead of SqNumberParser behind Number class >> #readFrom:. In particular, our use of ExtendedNumberParser means that PetitSmalltalk doesn't work in Squeak (because we then can't tell that " a := 1." is a terminated statement rather than the assignment of a Float). I understand the desire for a very liberal number parser; I just wonder if we shouldn't have a separate entry point, like (needs a better name!) Number class >> #readLiberallyFrom:. What do you think? (Also, this removes the need for putting a number grammar into PetitSmalltalk which, while theoretically pleasing/elegant is also something that I can't figure out how to make efficient.) frank

1 0

Using Monticello
by blake 19 Apr '12

19 Apr '12

Separate of Seaside, I decided to try to figure out how Monticello is supposed to work so I could then report back on what's wrong in the Seaside Dev book and I came across this video from Ramon Leon on how to use Monticello. http://onsmalltalk.com/screencast-how-to-package-smalltalk-code-with-montic… ...and I get hung up in the exact same place! 1. I created a category called "AAA" and made a class called "AAA1" with a single method "someMethod". 2. I opened the Monticello browser. 3. I added the package "AAA" to the Monticello browser. 4. I browsed the package "AAA" from the Monticello browser, which was reassuring. 5. I added a repository, pointing to a local directory. 6. I clicked on "Add to package..." (argh, still seems like it should be "add package to...") 7. The "AAA" package is not there. Now, I subsequently checked "AAA" in the Package pane and the local dir in the repository pane and pressed "Save". That seemed to work! So I removed the class from the system browser, then went back to the repository, clicked Open, saw the "AAA" category, clicked that and the mcz file name--and it loaded just fine. But I'm worried because step 6 doesn't make any sense to me and doesn't seem to work for me like it does elsewhere. ====Blake===

2 1

The Trunk: Monticello-bf.504.mcz
by commits＠source.squeak.org 19 Apr '12

19 Apr '12

Bert Freudenberg uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-bf.504.mcz ==================== Summary ==================== Name: Monticello-bf.504 Author: bf Time: 19 April 2012, 9:36:55.211 am UUID: 5fa1177d-b1ed-4cf0-8628-229f171ca814 Ancestors: Monticello-eem.503 Fix intermittant load problem. We sometimes would get a 'changes file not found' in the middle of updating, but retrying found it just fine. I finally tracked it down to too many files being open. This change re-uses the same read-only copy during a package load (which additionally might speed up loading a tiny bit). =============== Diff against Monticello-eem.503 =============== Item was changed: ----- Method: MCPackageLoader>>basicLoad (in category 'private') ----- basicLoad "Load the contents of some package. This is the core loading method in Monticello. Be wary about modifying it unless you understand the details and dependencies of the various entities being modified." | pkgName | errorDefinitions := OrderedCollection new. "Obviously this isn't the package name but we don't have anything else to use here. ChangeSet current name will generally work since a CS is usually installed prior to installation." pkgName := ChangeSet current name. + [CurrentReadOnlySourceFiles cacheDuring: [[ + "Pass 1: Load everything but the methods, which are collected in methodAdditions." - [["Pass 1: Load everything but the methods, which are collected in methodAdditions." additions do: [:ea | ea isMethodDefinition ifTrue:[methodAdditions add: ea asMethodAddition] ifFalse:[[ea load]on: Error do: [errorDefinitions add: ea]]. ] displayingProgress: 'Reshaping ', pkgName. "Try again any delayed definitions" self shouldWarnAboutErrors ifTrue: [self warnAboutErrors]. errorDefinitions do: [:ea | ea load] displayingProgress: 'Reloading ', pkgName. "Pass 2: We compile new / changed methods" methodAdditions do:[:ea| ea createCompiledMethod] displayingProgress: 'Compiling ', pkgName. 'Installing ', pkgName displayProgressFrom: 0 to: 2 during:[:bar| "There is no progress *during* installation since a progress bar update will redraw the world and potentially call methods that we're just trying to install." bar value: 1. "Pass 3: Install the new / changed methods (this is a separate pass to allow compiler changes to be loaded)" methodAdditions do:[:ea| ea installMethod]. "Pass 4: Remove the obsolete methods" removals do:[:ea| ea unload]. ]. "Finally, notify observers for the method additions" methodAdditions do: [:each | each notifyObservers] "the message is fake but actually telling people how much time we spend in the notifications is embarrassing so lie instead" displayingProgress: 'Installing ', pkgName. additions do: [:ea | ea postloadOver: (self obsoletionFor: ea)] displayingProgress: 'Initializing ', pkgName. ] on: InMidstOfFileinNotification do: [:n | n resume: true] + ]] ensure: [self flushChangesFile]! - ] ensure: [self flushChangesFile]!

1 0

should I commit this?
by Eliot Miranda 19 Apr '12

19 Apr '12

SystemNavigation class methods for error handling doesNotUnderstand: aMessage (self includesSelector: aMessage selector) ifTrue: [^self default perform: aMessage selector withArguments: aMessage arguments]. ^super doesNotUnderstand: aMessage fed up of typing new ;) -- best, Eliot

6 6

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

Jump to page: