hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:1f387878f9c6
+:a57b8a71a061
 "Modified: / 12-04-2011 / 21:36:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listOfVariables
 |nameList numClasses classes class commonSubclass showingClassVars
-sortByName|
+sortByName classesAlreadyProcessed|
 classHolder isNil ifTrue:[
 "/ testing
 ^ #()
 ].
 numClasses > 1 ifTrue:[
 "/ multiple classes - sort alphabetically ...
 "/ unless there is a common subclass ...
 nameList := Set new.
+classesAlreadyProcessed := IdentitySet new.
 classes do:[:class |
-showingClassVars ifTrue:[
+(classesAlreadyProcessed includes:class) ifFalse:[
-self showingInheritedClassVars ifTrue:[
+showingClassVars ifTrue:[
-class theNonMetaclass withAllSuperclassesDo:[:cls|
+self showingInheritedClassVars ifTrue:[
+class theNonMetaclass withAllSuperclassesDo:[:cls|
+(classesAlreadyProcessed includes:cls) ifFalse:[
+nameList addAll:
+(cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm]).
+classesAlreadyProcessed add:cls.
+]
+]
+] ifFalse:[
 nameList addAll:
-(cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm])
+(class classVarNames collect:[:nm|self listEntryForClass: class name: nm])
 ]
 ] ifFalse:[
-nameList addAll:
+class withAllSuperclassesDo:[:cls|
-(class classVarNames collect:[:nm|self listEntryForClass: class name: nm])
+(classesAlreadyProcessed includes:cls) ifFalse:[
-]
+nameList addAll:
-] ifFalse:[
+(cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm]).
-class withAllSuperclassesDo:[:cls|
+classesAlreadyProcessed add:cls.
-nameList addAll:
+]
-(cls classVarNames collect:[:nm|self listEntryForClass: cls name: nm])
+]
 ]
 ]
 ].
 nameList := nameList asOrderedCollection.
 ] ifFalse:[
 nameList := nameList asSortedCollection:[:a :b|a name < b name].
 ].
 ^ nameList
 "Created: / 05-02-2000 / 13:42:11 / cg"
-"Modified: / 26-02-2000 / 01:05:36 / cg"
 "Modified: / 28-04-2011 / 13:18:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 08-08-2011 / 16:20:58 / cg"
 !
 postBuildWith:aBuilder
 |listView|
 ! !
 !VariableList class methodsFor:'documentation'!
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.11 2011-08-05 11:35:48 vrany Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.12 2011-08-08 16:28:30 cg Exp $'
 ! !

changeset 10550	a57b8a71a061
parent 10495	756e95b937cb
child 10871	f3a06b214071