Squeak-dev March 2011

squeak-dev@lists.squeakfoundation.org

84 participants
416 discussions

Re: [squeak-dev] The Trunk: Compiler-nice.201.mcz
by Bert Freudenberg 31 Mar '11

31 Mar '11

On 30.03.2011, at 22:45, commits(a)source.squeak.org wrote: > Name: Compiler-nice.201 > Author: nice > Time: 31 March 2011, 12:45:32.697 am > UUID: d694a5f8-4d75-2f4d-a06d-4c5de7fe1656 > Ancestors: Compiler-nice.200 > > Put optimized selectors in CompiledMethod literals so that senders can be browsed normally. > Take care to not overflow the scarse literal ressource. > > It is necessary to evaluate (Compiler recompileAll) before succesfully browsing senders of #ifNil: > > Thanks to Marcus at http://code.google.com/p/pharo/issues/detail?id=2559 for the idea. Neat! - Bert -

1 0

The Inbox: Tools-fbs.337.mcz
by commits＠source.squeak.org 31 Mar '11

31 Mar '11

A new version of Tools was added to project The Inbox: http://source.squeak.org/inbox/Tools-fbs.337.mcz ==================== Summary ==================== Name: Tools-fbs.337 Author: fbs Time: 31 March 2011, 9:53:27.584 am UUID: 51d7b7e0-9f76-8549-8612-5139c6f6b742 Ancestors: Tools-fbs.336 When you view a class comment, and switch classes, you must still be viewing a class comment. =============== Diff against Tools-fbs.336 =============== Item was changed: ----- Method: Browser>>selectClassNamed: (in category 'class list') ----- selectClassNamed: aSymbolOrString | className currentMessageCategoryName currentMessageName | currentMessageCategoryName := [self selectedMessageCategoryName] on: Error do: [:ex| ex return: nil]. currentMessageName := [self selectedMessageName] on: Error do: [:ex| ex return: nil]. selectedClassName := aSymbolOrString ifNotNil: [ aSymbolOrString asSymbol ]. self setClassOrganizer. "Try to reselect the category and/or selector if the new class has them." selectedMessageCategoryName :=(self messageCategoryList includes: currentMessageCategoryName) ifTrue: [currentMessageCategoryName] ifFalse: [nil]. + selectedMessageName := (self hasMessageCategorySelected - self selectMessageNamed: (self hasMessageCategorySelected ifTrue: [ currentMessageName ] ifFalse: [ nil ]). self hasMessageSelected ifTrue: [self editSelection: #editMessage] ifFalse: [self hasMessageCategorySelected ifTrue: [self editSelection: #newMessage] ifFalse: [self classCommentIndicated + ifTrue: [self editSelection: #editComment] - ifTrue: [] ifFalse: [self editSelection: (self hasClassSelected not ifTrue: [(metaClassIndicated or: [ self hasSystemCategorySelected not ]) ifTrue: [#none] ifFalse: [#newClass]] ifFalse: [#editClass])]]]. contents := nil. self selectedClass isNil ifFalse: [className := self selectedClass name. (RecentClasses includes: className) ifTrue: [RecentClasses remove: className]. RecentClasses addFirst: className. RecentClasses size > 16 ifTrue: [RecentClasses removeLast]]. self changed: #classSelectionChanged. self changed: #classCommentText. self changed: #classListIndex. "update my selection" self changed: #messageCategoryList. self changed: #messageList. self changed: #relabel. self contentsChanged!

1 0

The Inbox: ToolsTests-fbs.38.mcz
by commits＠source.squeak.org 31 Mar '11

31 Mar '11

A new version of ToolsTests was added to project The Inbox: http://source.squeak.org/inbox/ToolsTests-fbs.38.mcz ==================== Summary ==================== Name: ToolsTests-fbs.38 Author: fbs Time: 31 March 2011, 9:53:12.097 am UUID: 73e23739-61db-3240-be83-85fc0e677397 Ancestors: ToolsTests-fbs.37 When you view a class comment, and switch classes, you must still be viewing a class comment. =============== Diff against ToolsTests-fbs.37 =============== Item was added: + ----- Method: BrowserTest>>testClassCommentViewingPersists (in category 'as yet unclassified') ----- + testClassCommentViewingPersists + browser selectSystemCategory: browser class category. + self assert: browser classList size > 1 description: 'We use the first TWO classes in the category!!'. + browser classListIndex: 1. + browser metaClassIndicated: false. + browser editComment. + + browser classListIndex: 2. + self assert: browser editSelection = #editComment.!

1 0

Re: [squeak-dev] The Inbox: Tools-fbs.336.mcz
by Frank Shearar 31 Mar '11

31 Mar '11

On 2011/03/30 21:11, commits(a)source.squeak.org wrote: > A new version of Tools was added to project The Inbox: > http://source.squeak.org/inbox/Tools-fbs.336.mcz > > ==================== Summary ==================== > > Name: Tools-fbs.336 > Author: fbs > Time: 30 March 2011, 10:10:43.612 pm > UUID: 263e2db2-c0e9-9e4c-a644-e95106ae600b > Ancestors: Tools-fbs.335 > > As of this commit Browser has NO indices, and relies entirely on symbols to remember what it's browsing. > > We have lots more tests now (see the ToolsTests package) but we are far from having a comprehensive test suite for Browsers. Some actions require dummy classes, and I haven't thought through how to safely do that (I must look at Monticello's test suite), and some require major surgery before being testable. > > =============== Diff against Tools-fbs.335 =============== > > Item was changed: > CodeHolder subclass: #Browser > + instanceVariableNames: 'systemOrganizer classOrganizer metaClassOrganizer editSelection metaClassIndicated selectedSystemCategory selectedClassName selectedMessageName selectedMessageCategoryName' > - instanceVariableNames: 'systemOrganizer classOrganizer metaClassOrganizer messageCategoryListIndex editSelection metaClassIndicated selectedSystemCategory selectedClassName selectedMessageName selectedMessageCategoryName' > classVariableNames: 'ListClassesHierarchically RecentClasses' > poolDictionaries: '' > category: 'Tools-Browser'! > > !Browser commentStamp: '<historical>' prior: 0! > I represent a query path into the class descriptions, the software of the system.! I should add a warning: this branch makes extensive changes to core infrastructure. I know of one bug (select a class comment, then up-arrow in the class list: you're now looking at a class definition, not a class comment) and I'm sure there are more! frank

1 0

Homing in on FreeBSD vm build error
by Gary Dunn 31 Mar '11

31 Mar '11

The "missing" error function is in sqUnixX11.c, line 3076. It and the vicinity look like this: /* The remainder of color table defines a color cube with six steps for each primary color. Note that the corners of this cube repeat previous colors, but simplifies the mapping between RGB colors and color map indices. This color cube spans indices 40 through 255. */ { int r, g, b; for (r= 0; r < 6; r++) for (g= 0; g < 6; g++) for (b= 0; b < 6; b++) { int i= 40 + ((36 * r) + (6 * b) + g); if (i > 255) error("index out of range in color table compuation"); <<<<<<< line 3076 initColourmap(i, (r * 65535) / 5, (g * 65535) / 5, (b * 65535) / 5); } } Every other error function call in that source file uses perror, so I changed this one and recompiled. Again the vm hung, just like when I used the define. I checked the logic with my fingers and with maximum values of r, g and b i will be 255, so the limit test should never succeed. But it must be, to be triggering that function. Is one of these variables getting whacked? I could hack in a print to stderr to show the values through the loop ... I'll wait to hear from the experts. I checked man 3 perror and it looks reasonable. The perror() function finds the error message corresponding to the cur- rent value of the global variable errno (intro(2)) and writes it, fol- lowed by a newline, to the standard error file descriptor. If the argu- ment string is non-NULL and does not point to the null character, this string is prepended to the message string and separated from it by a colon and space (``: ''); otherwise, only the error message string is printed. However, in this case errno may not be set because this is not a system error. The man entry is not clear what happens in that case. But I could be way off the path here! -- Gary Dunn Honolulu

2 1

Daily Commit Log
by commits＠source.squeak.org 31 Mar '11

31 Mar '11

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2011-March/004455.html Name: Kernel-nice.563 Ancestors: Kernel-nice.562 As previously discussed in squeak-dev, implement two utilities: #newCompiler #newParser (self newCompiler) is a replacement for (self compilerClass new), except it arranges to have the compiler initialized with proper Parser. Advantage 1: This way, you can define only parserClass rather than a pair compilerClass/parserClass for experimenting alternate syntax. Also, this may later simplify Compiler initialization of parser inst. var. Advantage 2: If any special initialization is required for YourOwnCompiler/parser instance, then just refine #newCompiler/Parser rather than hacking each and every #compilerClass/parserClass sender. Disadvantage 1: Encouraging experimentations of alternate Parser might show the limits of some tools (MC RB etc...). Bet we wouldn't put such experimentations in trunk, would we ? Disadvantage 2: none foreseen, but you tell me. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004456.html Name: Morphic-nice.526 Ancestors: Morphic-dtl.525 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004457.html Name: ST80-nice.126 Ancestors: ST80-dtl.125 Use #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004458.html Name: Tools-nice.302 Ancestors: Tools-eem.301 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004459.html Name: Traits-nice.288 Ancestors: Traits-nice.287 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004460.html Name: Collections-nice.435 Ancestors: Collections-nice.434 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004461.html Name: Compiler-nice.199 Ancestors: Compiler-IgorStasenko.198 Use #newCompiler #newParser Move some #evaluate: methods to instance side to enable (self class newCompiler evaluate: 'nil') usage ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004462.html Name: CollectionsTests-nice.184 Ancestors: CollectionsTests-nice.183 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004463.html Name: Tests-nice.124 Ancestors: Tests-ul.123 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004464.html Name: System-nice.428 Ancestors: System-ul.427 Use #newCompiler #newParser ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004465.html Name: Compiler-nice.200 Ancestors: Compiler-nice.199 minor ifNil refactoring ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004466.html Name: Multilingual-nice.139 Ancestors: Multilingual-ul.138 minor ifNil refactoring ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004467.html Name: Tools-nice.303 Ancestors: Tools-nice.302 minor ifNil refactoring (Cuis) ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-March/004468.html Name: Compiler-nice.201 Ancestors: Compiler-nice.200 Put optimized selectors in CompiledMethod literals so that senders can be browsed normally. Take care to not overflow the scarse literal ressource. It is necessary to evaluate (Compiler recompileAll) before succesfully browsing senders of #ifNil: Thanks to Marcus at http://code.google.com/p/pharo/issues/detail?id=2559 for the idea. =============================================

1 0

The Trunk: Compiler-nice.201.mcz
by commits＠source.squeak.org 31 Mar '11

31 Mar '11

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.201.mcz ==================== Summary ==================== Name: Compiler-nice.201 Author: nice Time: 31 March 2011, 12:45:32.697 am UUID: d694a5f8-4d75-2f4d-a06d-4c5de7fe1656 Ancestors: Compiler-nice.200 Put optimized selectors in CompiledMethod literals so that senders can be browsed normally. Take care to not overflow the scarse literal ressource. It is necessary to evaluate (Compiler recompileAll) before succesfully browsing senders of #ifNil: Thanks to Marcus at http://code.google.com/p/pharo/issues/detail?id=2559 for the idea. =============== Diff against Compiler-nice.200 =============== Item was changed: ParseNode subclass: #Encoder + instanceVariableNames: 'scopeTable nTemps supered requestor class selector literalStream selectorSet litIndSet litSet sourceRanges globalSourceRanges addedSelectorAndMethodClassLiterals optimizedSelectors' - instanceVariableNames: 'scopeTable nTemps supered requestor class selector literalStream selectorSet litIndSet litSet sourceRanges globalSourceRanges addedSelectorAndMethodClassLiterals' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Kernel'! !Encoder commentStamp: '<historical>' prior: 0! I encode names and literals into tree nodes with byte codes for the compiler. Byte codes for literals are not assigned until the tree-sizing pass of the compiler, because only then is it known which literals are actually needed. I also keep track of sourceCode ranges during parsing and code generation so I can provide an inverse map for the debugger.! Item was changed: ----- Method: Encoder>>allLiterals (in category 'results') ----- allLiterals + addedSelectorAndMethodClassLiterals ifFalse: - ((literalStream isKindOf: WriteStream) - and: [ (addedSelectorAndMethodClassLiterals ifNil: [ false ]) not]) ifTrue: [addedSelectorAndMethodClassLiterals := true. + "Put the optimized selectors in literals so as to browse senders more easily" + optimizedSelectors := optimizedSelectors reject: [:e| literalStream originalContents hasLiteral: e]. + optimizedSelectors isEmpty ifFalse: [ + "Use one entry per literal if enough room, else make anArray" + literalStream position + optimizedSelectors size + 2 > 255 + ifTrue: [self litIndex: optimizedSelectors asArray] + ifFalse: [optimizedSelectors do: [:e | self litIndex: e]]]. + "Add a slot for selector or MethodProperties" + self litIndex: nil. + self litIndex: self associationForClass]. + ^literalStream contents! - self litIndex: nil. - self litIndex: self associationForClass]. - ^literalStream contents - - "The funky ifNil: [false], even though the init method initializes addedSAMCL, - is simply so that Monticello can load and compile this update without - killing the encoder that is compiling that update itself..."! Item was changed: ----- Method: Encoder>>initScopeAndLiteralTables (in category 'initialize-release') ----- initScopeAndLiteralTables scopeTable := StdVariables copy. litSet := StdLiterals copy. "comments can be left hanging on nodes from previous compilations. probably better than this hack fix is to create the nodes afresh on each compilation." scopeTable do: [:varNode| varNode comment: nil]. litSet do: [:varNode| varNode comment: nil]. selectorSet := StdSelectors copy. litIndSet := Dictionary new: 16. literalStream := WriteStream on: (Array new: 32). + addedSelectorAndMethodClassLiterals := false. + optimizedSelectors := Set new! - addedSelectorAndMethodClassLiterals := false! Item was removed: - ----- Method: Encoder>>nTemps:literals:class: (in category 'initialize-release') ----- - nTemps: n literals: lits class: cl - "Decompile." - - supered := false. - class := cl. - nTemps := n. - literalStream := ReadStream on: lits. - literalStream position: lits size. - sourceRanges := Dictionary new: 32. - globalSourceRanges := OrderedCollection new: 32. - ! Item was added: + ----- Method: Encoder>>noteOptimizedSelector: (in category 'encoding') ----- + noteOptimizedSelector: aSymbol + "Register a selector as being optimized. + These optimized selectors will later be registered into the literals so that tools can easily browse senders." + optimizedSelectors add: aSymbol! Item was changed: ----- Method: MessageNode>>sizeCodeForEffect: (in category 'code generation') ----- sizeCodeForEffect: encoder special > 0 + ifTrue: + [encoder noteOptimizedSelector: originalSelector. + ^self perform: (MacroSizers at: special) with: encoder with: false]. - ifTrue: [^self perform: (MacroSizers at: special) with: encoder with: false]. ^super sizeCodeForEffect: encoder! Item was changed: ----- Method: MessageNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder | total | special > 0 + ifTrue: + [encoder noteOptimizedSelector: originalSelector. + ^self perform: (MacroSizers at: special) with: encoder with: true]. - ifTrue: [^self perform: (MacroSizers at: special) with: encoder with: true]. receiver == NodeSuper ifTrue: [selector := selector copy "only necess for splOops"]. total := selector sizeCode: encoder args: arguments size super: receiver == NodeSuper. receiver == nil ifFalse: [total := total + (receiver sizeCodeForValue: encoder)]. sizes := arguments collect: [:arg | | argSize | argSize := arg sizeCodeForValue: encoder. total := total + argSize. argSize]. ^total!

1 0

The Inbox: Tools-fbs.336.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

A new version of Tools was added to project The Inbox: http://source.squeak.org/inbox/Tools-fbs.336.mcz ==================== Summary ==================== Name: Tools-fbs.336 Author: fbs Time: 30 March 2011, 10:10:43.612 pm UUID: 263e2db2-c0e9-9e4c-a644-e95106ae600b Ancestors: Tools-fbs.335 As of this commit Browser has NO indices, and relies entirely on symbols to remember what it's browsing. We have lots more tests now (see the ToolsTests package) but we are far from having a comprehensive test suite for Browsers. Some actions require dummy classes, and I haven't thought through how to safely do that (I must look at Monticello's test suite), and some require major surgery before being testable. =============== Diff against Tools-fbs.335 =============== Item was changed: CodeHolder subclass: #Browser + instanceVariableNames: 'systemOrganizer classOrganizer metaClassOrganizer editSelection metaClassIndicated selectedSystemCategory selectedClassName selectedMessageName selectedMessageCategoryName' - instanceVariableNames: 'systemOrganizer classOrganizer metaClassOrganizer messageCategoryListIndex editSelection metaClassIndicated selectedSystemCategory selectedClassName selectedMessageName selectedMessageCategoryName' classVariableNames: 'ListClassesHierarchically RecentClasses' poolDictionaries: '' category: 'Tools-Browser'! !Browser commentStamp: '<historical>' prior: 0! I represent a query path into the class descriptions, the software of the system.!

1 0

The Inbox: Tools-fbs.335.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

A new version of Tools was added to project The Inbox: http://source.squeak.org/inbox/Tools-fbs.335.mcz ==================== Summary ==================== Name: Tools-fbs.335 Author: fbs Time: 30 March 2011, 10:06:18.855 pm UUID: 7cce9339-38c3-914a-be10-29f6b3091a3a Ancestors: Tools-fbs.334 No more references to messageCategoryListIndex! =============== Diff against Tools-fbs.334 =============== Item was changed: ----- Method: Browser>>addCategory (in category 'message category functions') ----- addCategory "Present a choice of categories or prompt for a new category name and add it before the current selection, or at the end if no current selection" + | labels reject lines menuIndex newName oldCategory | - | labels reject lines menuIndex oldIndex newName oldCategory | self okToChange ifFalse: [^ self]. self hasClassSelected ifFalse: [^ self]. labels := OrderedCollection with: 'new...'. reject := Set new. reject addAll: self selectedClassOrMetaClass organization categories; add: ClassOrganizer nullCategory; add: ClassOrganizer default. lines := OrderedCollection new. self selectedClassOrMetaClass allSuperclasses do: [:cls | | cats | cls = Object ifFalse: [ cats := cls organization categories reject: [:cat | reject includes: cat]. cats isEmpty ifFalse: [ lines add: labels size. labels addAll: cats asSortedCollection. reject addAll: cats]]]. newName := (labels size = 1 or: [ menuIndex := (UIManager default chooseFrom: labels lines: lines title: 'Add Category'). menuIndex = 0 ifTrue: [^ self]. menuIndex = 1]) ifTrue: [ self request: 'Please type new category name' initialAnswer: 'category name'] ifFalse: [ labels at: menuIndex]. - oldIndex := messageCategoryListIndex. oldCategory := self selectedMessageCategoryName. newName isEmpty ifTrue: [^ self] ifFalse: [newName := newName asSymbol]. self classOrMetaClassOrganizer addCategory: newName + before: (self hasMessageCategorySelected + ifFalse: [nil] + ifTrue: [self selectedMessageCategoryName]). - before: (messageCategoryListIndex = 0 - ifTrue: [nil] - ifFalse: [self selectedMessageCategoryName]). self changed: #messageCategoryList. + self selectMessageCategoryNamed: + (oldCategory isNil + ifTrue: [self classOrMetaClassOrganizer categories last] + ifFalse: [oldCategory]). - self messageCategoryListIndex: - (oldIndex = 0 - ifTrue: [self classOrMetaClassOrganizer categories size + 1] - ifFalse: [oldIndex]). - " self selectMessageCategoryNamed: (oldCategory ifNil: [self messageCategoryList last] ifNotNil: [oldCategory])." self changed: #messageCategoryList. ! Item was changed: ----- Method: Browser>>compileMessage:notifying: (in category 'code pane') ----- compileMessage: aText notifying: aController "Compile the code that was accepted by the user, placing the compiled method into an appropriate message category. Return true if the compilation succeeded, else false." + | fallBackCategoryName originalSelectorName result fallBackMethodName | - | fallBackCategoryIndex originalSelectorName result fallBackMethodName | self selectedMessageCategoryName ifNil: [ self selectOriginalCategoryForCurrentMethod ifFalse:["Select the '--all--' category" self messageCategoryListIndex: 1]]. self selectedMessageCategoryName asSymbol = ClassOrganizer allCategory ifTrue: [ "User tried to save a method while the ALL category was selected" + fallBackCategoryName := selectedMessageCategoryName. - fallBackCategoryIndex := messageCategoryListIndex. fallBackMethodName := selectedMessageName. editSelection == #newMessage ifTrue: [ "Select the 'as yet unclassified' category" + selectedMessageCategoryName := nil. - messageCategoryListIndex := 0. (result := self defineMessageFrom: aText notifying: aController) ifNil: ["Compilation failure: reselect the original category & method" + selectedMessageCategoryName := fallBackCategoryName. - messageCategoryListIndex := fallBackCategoryIndex. selectedMessageName := fallBackMethodName] ifNotNil: [self setSelector: result]] ifFalse: [originalSelectorName := self selectedMessageName. self setOriginalCategoryIndexForCurrentMethod. selectedMessageName := fallBackMethodName := originalSelectorName. (result := self defineMessageFrom: aText notifying: aController) ifNotNil: [self setSelector: result] ifNil: [ "Compilation failure: reselect the original category & method" + selectedMessageCategoryName := fallBackCategoryName. - messageCategoryListIndex := fallBackCategoryIndex. selectedMessageName := fallBackMethodName. ^ result notNil]]. self changed: #messageCategoryList. ^ result notNil] ifFalse: [ "User tried to save a method while the ALL category was NOT selected" ^ (self defineMessageFrom: aText notifying: aController) notNil]! Item was changed: ----- Method: Browser>>messageCategoryListIndex: (in category 'message category list') ----- messageCategoryListIndex: anInteger "Set the selected message category to be the one indexed by anInteger." - messageCategoryListIndex := anInteger. selectedMessageCategoryName := nil. self selectMessageCategoryNamed: (self messageCategoryList at: anInteger ifAbsent: [nil]).! Item was changed: ----- Method: Browser>>messageList (in category 'message list') ----- messageList "Answer an Array of the message selectors of the currently selected message category, provided that the messageCategoryListIndex is in proper range. Otherwise, answer an empty Array If messageCategoryListIndex is found to be larger than the number of categories (it happens!!), it is reset to zero." | sel | (sel := self messageCategoryListSelection) ifNil: [ ^ self classOrMetaClassOrganizer ifNil: [Array new] ifNotNil: [self classOrMetaClassOrganizer allMethodSelectors] "^ Array new" ]. ^ sel = ClassOrganizer allCategory ifTrue: [self classOrMetaClassOrganizer ifNil: [Array new] ifNotNil: [self classOrMetaClassOrganizer allMethodSelectors]] ifFalse: [(self classOrMetaClassOrganizer listAtCategoryNamed: self selectedMessageCategoryName ) + ifNil: [selectedMessageCategoryName := nil. Array new]]! - ifNil: [messageCategoryListIndex := 0. selectedMessageCategoryName := nil. Array new]]! Item was changed: ----- Method: Browser>>metaClassIndicated: (in category 'metaclass') ----- metaClassIndicated: trueOrFalse "Indicate whether browsing instance or class messages." metaClassIndicated := trueOrFalse. self setClassOrganizer. self hasSystemCategorySelected ifTrue: [self editSelection: (self hasClassSelected ifFalse: [metaClassIndicated ifTrue: [#none] ifFalse: [#newClass]] ifTrue: [#editClass])]. - messageCategoryListIndex := 0. selectedMessageCategoryName := nil. selectedMessageName := nil. contents := nil. self changed: #classSelectionChanged. self changed: #messageCategoryList. self changed: #messageList. self changed: #contents. self changed: #annotation. self decorateButtons ! Item was changed: ----- Method: Browser>>rawMessageCategoryList (in category 'message category list') ----- rawMessageCategoryList ^ self hasClassSelected ifTrue: [self classOrMetaClassOrganizer categories] ifFalse: [Array new]! Item was changed: ----- Method: Browser>>selectClassNamed: (in category 'class list') ----- selectClassNamed: aSymbolOrString | className currentMessageCategoryName currentMessageName | currentMessageCategoryName := [self selectedMessageCategoryName] on: Error do: [:ex| ex return: nil]. currentMessageName := [self selectedMessageName] on: Error do: [:ex| ex return: nil]. selectedClassName := aSymbolOrString ifNotNil: [ aSymbolOrString asSymbol ]. self setClassOrganizer. "Try to reselect the category and/or selector if the new class has them." - messageCategoryListIndex := self messageCategoryList - indexOf: currentMessageCategoryName - ifAbsent: [0]. selectedMessageCategoryName :=(self messageCategoryList includes: currentMessageCategoryName) ifTrue: [currentMessageCategoryName] ifFalse: [nil]. self selectMessageNamed: (self hasMessageCategorySelected ifTrue: [ currentMessageName ] ifFalse: [ nil ]). self hasMessageSelected ifTrue: [self editSelection: #editMessage] ifFalse: [self hasMessageCategorySelected ifTrue: [self editSelection: #newMessage] ifFalse: [self classCommentIndicated ifTrue: [] ifFalse: [self editSelection: (self hasClassSelected not ifTrue: [(metaClassIndicated or: [ self hasSystemCategorySelected not ]) ifTrue: [#none] ifFalse: [#newClass]] ifFalse: [#editClass])]]]. contents := nil. self selectedClass isNil ifFalse: [className := self selectedClass name. (RecentClasses includes: className) ifTrue: [RecentClasses remove: className]. RecentClasses addFirst: className. RecentClasses size > 16 ifTrue: [RecentClasses removeLast]]. self changed: #classSelectionChanged. self changed: #classCommentText. self changed: #classListIndex. "update my selection" self changed: #messageCategoryList. self changed: #messageList. self changed: #relabel. self contentsChanged! Item was changed: ----- Method: Browser>>selectMessageCategoryNamed: (in category 'message category list') ----- selectMessageCategoryNamed: aSymbol "Given aSymbol, select the category with that name. Do nothing if aSymbol doesn't exist." selectedMessageCategoryName := aSymbol. - messageCategoryListIndex := aSymbol ifNil: [0] ifNotNil: [self messageCategoryList indexOf: aSymbol]. selectedMessageName := nil. self changed: #messageCategorySelectionChanged. self changed: #messageCategoryListIndex. "update my selection" self changed: #messageList. self editSelection: (aSymbol notNil ifTrue: [#newMessage] ifFalse: [self hasClassSelected ifTrue: [#editClass] ifFalse: [#newClass]]). contents := nil. self contentsChanged.! Item was changed: ----- Method: Browser>>selectOriginalCategoryForCurrentMethod (in category 'message category list') ----- selectOriginalCategoryForCurrentMethod "private - Select the message category for the current method. Note: This should only be called when somebody tries to save a method that they are modifying while ALL is selected. Returns: true on success, false on failure." | aSymbol selectorName | aSymbol := self categoryOfCurrentMethod. selectorName := self selectedMessageName. (aSymbol notNil and: [aSymbol ~= ClassOrganizer allCategory]) ifTrue: + [selectedMessageCategoryName := aSymbol. - [messageCategoryListIndex := (self messageCategoryList indexOf: aSymbol). - selectedMessageCategoryName := aSymbol. selectedMessageName := selectorName. self changed: #messageCategorySelectionChanged. self changed: #messageCategoryListIndex. "update my selection" self changed: #messageList. self changed: #messageListIndex. ^ true]. ^ false! Item was changed: ----- Method: Browser>>selectSystemCategory: (in category 'system category list') ----- selectSystemCategory: aSymbol "Set the selected system category. Update all other selections to be deselected." selectedSystemCategory := aSymbol. selectedClassName := nil. - messageCategoryListIndex := 0. selectedMessageCategoryName := nil. selectedMessageName := nil. self editSelection: ( aSymbol isNil ifTrue: [#none] ifFalse: [#newClass]). metaClassIndicated := false. self setClassOrganizer. contents := nil. self changed: #systemCategorySelectionChanged. self changed: #systemCategoryListIndex. "update my selection" self changed: #classList. self changed: #messageCategoryList. self changed: #messageList. self changed: #relabel. self contentsChanged! Item was changed: ----- Method: Browser>>selectedMessageCategoryName (in category 'message category list') ----- selectedMessageCategoryName "Answer the name of the selected message category, if any. Answer nil otherwise." + ^ selectedMessageCategoryName! - messageCategoryListIndex = 0 ifTrue: [^nil]. - ^self messageCategoryList at: messageCategoryListIndex! Item was changed: ----- Method: Browser>>setOriginalCategoryIndexForCurrentMethod (in category 'message category list') ----- setOriginalCategoryIndexForCurrentMethod "private - Set the message category index for the currently selected method. Note: This should only be called when somebody tries to save a method that they are modifying while ALL is selected." - messageCategoryListIndex := self messageCategoryList indexOf: self categoryOfCurrentMethod. selectedMessageCategoryName := self categoryOfCurrentMethod.! Item was changed: ----- Method: Browser>>systemOrganizer: (in category 'initialize-release') ----- systemOrganizer: aSystemOrganizer "Initialize the receiver as a perspective on the system organizer, aSystemOrganizer. Typically there is only one--the system variable SystemOrganization." contents := nil. systemOrganizer := aSystemOrganizer. selectedSystemCategory := nil. selectedMessageCategoryName := nil. selectedClassName := nil. - messageCategoryListIndex := 0. selectedMessageName := nil. metaClassIndicated := false. self setClassOrganizer. self editSelection: #none.! Item was changed: ----- Method: Browser>>veryDeepInner: (in category 'copying') ----- veryDeepInner: deepCopier "Copy all of my instance variables. Some need to be not copied at all, but shared. See DeepCopier class comment." super veryDeepInner: deepCopier. "systemOrganizer := systemOrganizer. clone has the old value. we share it" "classOrganizer := classOrganizer clone has the old value. we share it" "metaClassOrganizer := metaClassOrganizer clone has the old value. we share it" selectedSystemCategory := selectedSystemCategory veryDeepCopyWith: deepCopier. selectedClassName := selectedClassName veryDeepCopyWith: deepCopier. - messageCategoryListIndex := messageCategoryListIndex veryDeepCopyWith: deepCopier. selectedMessageCategoryName := selectedMessageCategoryName veryDeepCopyWith: deepCopier. selectedMessageName := selectedMessageName veryDeepCopyWith: deepCopier. editSelection := editSelection veryDeepCopyWith: deepCopier. metaClassIndicated := metaClassIndicated veryDeepCopyWith: deepCopier. ! Item was changed: ----- Method: MessageSet>>compileMessage:notifying: (in category 'as yet unclassified') ----- compileMessage: aText notifying: aController "Compile the code that was accepted by the user, placing the compiled method into an appropriate message category. Return true if the compilation succeeded, else false." "Copied from Browser's version of sd 11/20/2005 21:26 because later versions remove messageListIndex." + | fallBackCategoryName fallBackMethodIndex originalSelectorName result | - | fallBackCategoryName fallBackCategoryIndex fallBackMethodIndex originalSelectorName result | self selectedMessageCategoryName ifNil: [ self selectOriginalCategoryForCurrentMethod ifFalse:["Select the '--all--' category" self messageCategoryListIndex: 1]]. self selectedMessageCategoryName asSymbol = ClassOrganizer allCategory ifTrue: [ "User tried to save a method while the ALL category was selected" - fallBackCategoryIndex := messageCategoryListIndex. fallBackCategoryName := selectedMessageCategoryName. fallBackMethodIndex := messageListIndex. editSelection == #newMessage ifTrue: [ "Select the 'as yet unclassified' category" - messageCategoryListIndex := 0. selectedMessageCategoryName := nil. (result := self defineMessageFrom: aText notifying: aController) ifNil: ["Compilation failure: reselect the original category & method" - messageCategoryListIndex := fallBackCategoryIndex. selectedMessageCategoryName := fallBackCategoryName. messageListIndex := fallBackMethodIndex] ifNotNil: [self setSelector: result]] ifFalse: [originalSelectorName := self selectedMessageName. self setOriginalCategoryIndexForCurrentMethod. messageListIndex := fallBackMethodIndex := self messageList indexOf: originalSelectorName. (result := self defineMessageFrom: aText notifying: aController) ifNotNil: [self setSelector: result] ifNil: [ "Compilation failure: reselect the original category & method" - messageCategoryListIndex := fallBackCategoryIndex. selectedMessageCategoryName := fallBackCategoryName. messageListIndex := fallBackMethodIndex. ^ result notNil]]. self changed: #messageCategoryList. ^ result notNil] ifFalse: [ "User tried to save a method while the ALL category was NOT selected" ^ (self defineMessageFrom: aText notifying: aController) notNil]! Item was changed: ----- Method: PackagePaneBrowser>>packageListIndex: (in category 'package list') ----- packageListIndex: anInteger "Set anInteger to be the index of the current package selection." packageListIndex := anInteger. anInteger = 0 ifFalse: [package := self packageList at: packageListIndex]. - messageCategoryListIndex := 0. selectedMessageCategoryName := nil. self selectSystemCategory: nil. selectedMessageName := nil. selectedClassName := nil. self setClassOrganizer. self changed: #packageSelectionChanged. self changed: #packageListIndex. "update my selection" self changed: #systemCategoryList. "update the category list" self selectSystemCategory: nil. "update category list selection" !

1 0

The Trunk: Tools-nice.303.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-nice.303.mcz ==================== Summary ==================== Name: Tools-nice.303 Author: nice Time: 30 March 2011, 10:57:43.746 pm UUID: d9673fd5-327b-ae4c-ab27-25f055a80463 Ancestors: Tools-nice.302 minor ifNil refactoring (Cuis) =============== Diff against Tools-nice.302 =============== Item was changed: ----- Method: Browser>>toggleBreakOnEntry (in category 'breakpoints') ----- toggleBreakOnEntry "Install or uninstall a halt-on-entry breakpoint" | selectedMethod | + self selectedClassOrMetaClass ifNil: [ ^self]. - self selectedClassOrMetaClass isNil ifTrue:[^self]. selectedMethod := self selectedClassOrMetaClass >> self selectedMessageName. selectedMethod hasBreakpoint ifTrue: [BreakpointManager unInstall: selectedMethod] ifFalse: [BreakpointManager installInClass: self selectedClassOrMetaClass selector: self selectedMessageName]. + self changed: #messageList! - self changed: #messageList - ! Item was changed: ----- Method: Debugger>>toggleBreakOnEntry (in category 'breakpoints') ----- toggleBreakOnEntry "Install or uninstall a halt-on-entry breakpoint" | selectedMethod | + self selectedClassOrMetaClass ifNil: [ ^self]. - self selectedClassOrMetaClass isNil ifTrue:[^self]. selectedMethod := self selectedClassOrMetaClass >> self selectedMessageName. selectedMethod hasBreakpoint ifTrue: [BreakpointManager unInstall: selectedMethod] ifFalse: [BreakpointManager installInClass: self selectedClassOrMetaClass selector: self selectedMessageName].! Item was changed: ----- Method: FileContentsBrowser>>infoString (in category 'infoView') ----- infoString + ^infoString ifNil: [infoString := StringHolder new]! - ^infoString isNil - ifTrue:[infoString := StringHolder new] - ifFalse:[infoString]! Item was changed: ----- Method: FileContentsBrowser>>removeUnmodifiedClasses (in category 'removing') ----- removeUnmodifiedClasses | packageList | self okToChange ifFalse:[^self]. + packageList := self selectedPackage + ifNil: [ self packages] + ifNotNil: [ Array with: self selectedPackage]. - packageList := self selectedPackage isNil - ifTrue:[self packages] - ifFalse:[Array with: self selectedPackage]. packageList do:[:package| package classes copy do:[:theClass| Cursor wait showWhile:[ theClass removeAllUnmodified. ]. theClass hasChanges ifFalse:[ package removeClass: theClass. ]. ]]. self classListIndex: 0. + self changed: #classList! - self changed: #classList.! Item was changed: ----- Method: FileContentsBrowser>>removeUnmodifiedMethods (in category 'removing') ----- removeUnmodifiedMethods | theClass cat | self okToChange ifFalse:[^self]. theClass := self selectedClassOrMetaClass. + theClass ifNil: [ ^self]. - theClass isNil ifTrue:[^self]. cat := self selectedMessageCategoryName. + cat ifNil: [ ^self]. - cat isNil ifTrue:[^self]. Cursor wait showWhile:[ theClass removeUnmodifiedMethods: (theClass organization listAtCategoryNamed: cat). ]. self messageListIndex: 0. self changed: #messageList.! Item was changed: ----- Method: FileList>>isFileSelected (in category 'private') ----- isFileSelected "return if a file is currently selected" + ^ fileName notNil! - ^ fileName isNil not! Item was changed: ----- Method: PluggableFileList class>>fileNameSelectedAcceptBlock (in category 'canAcceptBlocks') ----- fileNameSelectedAcceptBlock + ^[:theDirectory :theFileName | theFileName notNil]! - ^[:theDirectory :theFileName | theFileName isNil not]! Item was changed: ----- Method: SelectionMenu>>startUpWithCaption:at:allowKeyboard: (in category 'basic control sequence') ----- startUpWithCaption: captionOrNil at: location allowKeyboard: aBoolean "Overridden to return value returned by manageMarker. The boolean parameter indicates whether the menu should be given keyboard focus (if in morphic)" | index | index := super startUpWithCaption: captionOrNil at: location allowKeyboard: aBoolean. + (selections isNil or: [(index between: 1 and: selections size) not]) - (selections = nil or: [(index between: 1 and: selections size) not]) ifTrue: [^ nil]. ^ selections at: index!

1 0

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

Jump to page: