Move method's literals form literalArray to indexed instvars.
--- a/SBrowser.st Fri Jun 28 16:12:50 1996 +0200
+++ b/SBrowser.st Fri Jun 28 17:33:13 1996 +0200
@@ -10,7 +10,7 @@
hereby transferred.
"
-'From Smalltalk/X, Version:2.10.9 on 19-jun-1996 at 14:29:50' !
+'From Smalltalk/X, Version:2.10.9 on 25-jun-1996 at 14:32:42' !
ApplicationModel subclass:#SystemBrowser
instanceVariableNames:'currentClass currentMethodCategory currentMethod currentSelector
@@ -292,52 +292,44 @@
|sel browser searchBlock|
((aSelectorString ~= '*') and:[aSelectorString includesMatchCharacters]) ifTrue:[
- "a matchString"
- searchBlock := [:class :method :s |
- |lits found|
-
- lits := method literals.
- found := false.
- lits notNil ifTrue:[
- lits do:[:aLiteral |
- found ifFalse:[
- (aLiteral isMemberOf:Symbol) ifTrue:[
- found := (aSelectorString match:aLiteral)
- ]
- ]
- ]
- ].
- found
- ].
+ "a matchString"
+ searchBlock := [:class :method :s |
+ method literalsDetect:[:aLiteral|
+ (aLiteral isMemberOf:Symbol)
+ and:[aSelectorString match:aLiteral]
+ ] ifNone:[false] ~~ false
+ ].
] ifFalse:[
- sel := aSelectorString asSymbolIfInterned.
- sel isNil ifTrue:[
+ sel := aSelectorString asSymbolIfInterned.
+ sel isNil ifTrue:[
"
- Transcript showCR:'none found.'.
+ Transcript showCR:'none found.'.
"
- self showNoneFound:title.
- ^ nil
- ].
- searchBlock := [:class :method :s | method sends:sel].
+ self showNoneFound:title.
+ ^ nil
+ ].
+ searchBlock := [:class :method :s | method sends:sel].
].
browser := self browseMethodsIn:aCollectionOfClasses
- where:searchBlock
- title:title.
+ where:searchBlock
+ title:title.
browser notNil ifTrue:[
- |s|
+ |s|
- "
- kludge for now, if its a multipart selector,
- no easy search is (as yet) possible
- "
- s := aSelectorString.
- (s includes:$:) ifTrue:[
- s := s copyTo:(s indexOf:$:)
- ].
- browser autoSearch:s
+ "
+ kludge for now, if its a multipart selector,
+ no easy search is (as yet) possible
+ "
+ s := aSelectorString.
+ (s includes:$:) ifTrue:[
+ s := s copyTo:(s indexOf:$:)
+ ].
+ browser autoSearch:s
].
^ browser
+
+ "Modified: 24.6.1996 / 14:35:01 / stefan"
!
browseCallsOn:aSelectorString under:aClass
@@ -509,20 +501,10 @@
(aSymbol includesMatchCharacters) ifTrue:[
"a matchString"
searchBlock := [:c :m :s |
- |found lits|
-
- lits := m literals.
- found := false.
- lits notNil ifTrue:[
- lits do:[:aLiteral |
- found ifFalse:[
- (aLiteral isMemberOf:Symbol) ifTrue:[
- found := (aSymbol match:aLiteral)
- ]
- ]
- ]
- ].
- found
+ m literalsDetect:[:aLiteral|
+ (aLiteral isMemberOf:Symbol)
+ and:[aSymbol match:aLiteral]
+ ] ifNone:[false] ~~ false
].
] ifFalse:[
"
@@ -535,20 +517,10 @@
].
searchBlock := [:c :m :s |
- |found lits|
-
- lits := m literals.
- found := false.
- lits notNil ifTrue:[
- lits do:[:aLiteral |
- found ifFalse:[
- (aLiteral isMemberOf:Symbol) ifTrue:[
- found := (sym == aLiteral)
- ]
- ]
- ]
- ].
- found
+ m literalsDetect:[:aLiteral|
+ (aLiteral isMemberOf:Symbol)
+ and:[aSymbol == aLiteral]
+ ] ifNone:[false] ~~ false
].
].
doWarn ifFalse:[
@@ -564,6 +536,7 @@
^ browser
"Modified: 20.2.1996 / 20:25:42 / cg"
+ "Modified: 24.6.1996 / 14:39:07 / stefan"
!
browseImplementorsOf:aSelectorString
@@ -1355,6 +1328,6 @@
!SystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/SBrowser.st,v 1.63 1996-06-19 22:30:09 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/SBrowser.st,v 1.64 1996-06-28 15:33:13 stefan Exp $'
! !
SystemBrowser initialize!
--- a/SystemBrowser.st Fri Jun 28 16:12:50 1996 +0200
+++ b/SystemBrowser.st Fri Jun 28 17:33:13 1996 +0200
@@ -10,7 +10,7 @@
hereby transferred.
"
-'From Smalltalk/X, Version:2.10.9 on 19-jun-1996 at 14:29:50' !
+'From Smalltalk/X, Version:2.10.9 on 25-jun-1996 at 14:32:42' !
ApplicationModel subclass:#SystemBrowser
instanceVariableNames:'currentClass currentMethodCategory currentMethod currentSelector
@@ -292,52 +292,44 @@
|sel browser searchBlock|
((aSelectorString ~= '*') and:[aSelectorString includesMatchCharacters]) ifTrue:[
- "a matchString"
- searchBlock := [:class :method :s |
- |lits found|
-
- lits := method literals.
- found := false.
- lits notNil ifTrue:[
- lits do:[:aLiteral |
- found ifFalse:[
- (aLiteral isMemberOf:Symbol) ifTrue:[
- found := (aSelectorString match:aLiteral)
- ]
- ]
- ]
- ].
- found
- ].
+ "a matchString"
+ searchBlock := [:class :method :s |
+ method literalsDetect:[:aLiteral|
+ (aLiteral isMemberOf:Symbol)
+ and:[aSelectorString match:aLiteral]
+ ] ifNone:[false] ~~ false
+ ].
] ifFalse:[
- sel := aSelectorString asSymbolIfInterned.
- sel isNil ifTrue:[
+ sel := aSelectorString asSymbolIfInterned.
+ sel isNil ifTrue:[
"
- Transcript showCR:'none found.'.
+ Transcript showCR:'none found.'.
"
- self showNoneFound:title.
- ^ nil
- ].
- searchBlock := [:class :method :s | method sends:sel].
+ self showNoneFound:title.
+ ^ nil
+ ].
+ searchBlock := [:class :method :s | method sends:sel].
].
browser := self browseMethodsIn:aCollectionOfClasses
- where:searchBlock
- title:title.
+ where:searchBlock
+ title:title.
browser notNil ifTrue:[
- |s|
+ |s|
- "
- kludge for now, if its a multipart selector,
- no easy search is (as yet) possible
- "
- s := aSelectorString.
- (s includes:$:) ifTrue:[
- s := s copyTo:(s indexOf:$:)
- ].
- browser autoSearch:s
+ "
+ kludge for now, if its a multipart selector,
+ no easy search is (as yet) possible
+ "
+ s := aSelectorString.
+ (s includes:$:) ifTrue:[
+ s := s copyTo:(s indexOf:$:)
+ ].
+ browser autoSearch:s
].
^ browser
+
+ "Modified: 24.6.1996 / 14:35:01 / stefan"
!
browseCallsOn:aSelectorString under:aClass
@@ -509,20 +501,10 @@
(aSymbol includesMatchCharacters) ifTrue:[
"a matchString"
searchBlock := [:c :m :s |
- |found lits|
-
- lits := m literals.
- found := false.
- lits notNil ifTrue:[
- lits do:[:aLiteral |
- found ifFalse:[
- (aLiteral isMemberOf:Symbol) ifTrue:[
- found := (aSymbol match:aLiteral)
- ]
- ]
- ]
- ].
- found
+ m literalsDetect:[:aLiteral|
+ (aLiteral isMemberOf:Symbol)
+ and:[aSymbol match:aLiteral]
+ ] ifNone:[false] ~~ false
].
] ifFalse:[
"
@@ -535,20 +517,10 @@
].
searchBlock := [:c :m :s |
- |found lits|
-
- lits := m literals.
- found := false.
- lits notNil ifTrue:[
- lits do:[:aLiteral |
- found ifFalse:[
- (aLiteral isMemberOf:Symbol) ifTrue:[
- found := (sym == aLiteral)
- ]
- ]
- ]
- ].
- found
+ m literalsDetect:[:aLiteral|
+ (aLiteral isMemberOf:Symbol)
+ and:[aSymbol == aLiteral]
+ ] ifNone:[false] ~~ false
].
].
doWarn ifFalse:[
@@ -564,6 +536,7 @@
^ browser
"Modified: 20.2.1996 / 20:25:42 / cg"
+ "Modified: 24.6.1996 / 14:39:07 / stefan"
!
browseImplementorsOf:aSelectorString
@@ -1355,6 +1328,6 @@
!SystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.63 1996-06-19 22:30:09 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.64 1996-06-28 15:33:13 stefan Exp $'
! !
SystemBrowser initialize!