--- a/Method.st Wed Aug 16 20:18:52 2000 +0200
+++ b/Method.st Thu Aug 17 16:01:48 2000 +0200
@@ -1754,62 +1754,62 @@
privInfo := ''.
self isWrapped ifTrue:[
- (MessageTracer isCounting:self) ifTrue:[
- (MessageTracer isCountingMemoryUsage:self) ifTrue:[
- moreInfo := moreInfo ,
- ' (mem usage avg: ' , (MessageTracer memoryUsageOfMethod:self) printString asText allBold , ' bytes)'.
- ] ifFalse:[
- moreInfo := moreInfo ,
- ' (called ' , (MessageTracer executionCountOfMethod:self) printString asText allBold , ' times)'.
- ]
- ] ifFalse:[
- (MessageTracer isTiming:self) ifTrue:[
- i := MessageTracer executionTimesOfMethod:self.
- (i isNil or:[(n := i at:#count) == 0]) ifTrue:[
- moreInfo := moreInfo ,
- ' (cnt: ' , (i at:#count) printString , ')'
- ] ifFalse:[
- n == 1 ifTrue:[
- moreInfo := moreInfo ,
- ' (t: ' , (i at:#avgTime) printString asText allBold,
- 'ms cnt: ' , (i at:#count) printString , ')'
- ] ifFalse:[
- moreInfo := moreInfo ,
- ' (avg: ' , (i at:#avgTime) printString asText allBold,
- 'ms min: ' , (i at:#minTime) printString ,
- ' max: ' , (i at:#maxTime) printString ,
- ' cnt: ' , (i at:#count) printString , ')'
- ].
- ].
- ] ifFalse:[
- moreInfo := ' !!'
- ]
- ].
+ (MessageTracer isCounting:self) ifTrue:[
+ (MessageTracer isCountingMemoryUsage:self) ifTrue:[
+ moreInfo := moreInfo ,
+ ' (mem usage avg: ' , (MessageTracer memoryUsageOfMethod:self) printString asText allBold , ' bytes)'.
+ ] ifFalse:[
+ moreInfo := moreInfo ,
+ ' (called ' , (MessageTracer executionCountOfMethod:self) printString asText allBold , ' times)'.
+ ]
+ ] ifFalse:[
+ (MessageTracer isTiming:self) ifTrue:[
+ i := MessageTracer executionTimesOfMethod:self.
+ (i isNil or:[(n := i at:#count) == 0]) ifTrue:[
+ moreInfo := moreInfo ,
+ ' (cnt: ' , (i at:#count) printString , ')'
+ ] ifFalse:[
+ n == 1 ifTrue:[
+ moreInfo := moreInfo ,
+ ' (t: ' , (i at:#avgTime) printString asText allBold,
+ 'ms cnt: ' , (i at:#count) printString , ')'
+ ] ifFalse:[
+ moreInfo := moreInfo ,
+ ' (avg: ' , (i at:#avgTime) printString asText allBold,
+ 'ms min: ' , (i at:#minTime) printString ,
+ ' max: ' , (i at:#maxTime) printString ,
+ ' cnt: ' , (i at:#count) printString , ')'
+ ].
+ ].
+ ] ifFalse:[
+ moreInfo := ' !!'
+ ]
+ ].
].
p := self privacy.
p ~~ #public ifTrue:[
- privInfo := (' (* ' , p , ' *)') asText emphasizeAllWith:#italic.
+ privInfo := (' (* ' , p , ' *)') asText emphasizeAllWith:#italic.
].
self isInvalid ifTrue:[
- moreInfo := ' (** not executable **)'.
+ moreInfo := ' (** not executable **)'.
].
(self isLazyMethod not and:[self isUnloaded]) ifTrue:[
- moreInfo := ' (** unloaded **)'
+ moreInfo := ' (** unloaded **)'
].
privInfo size ~~ 0 ifTrue:[
- moreInfo := privInfo , ' ' , moreInfo
+ moreInfo := privInfo , ' ' , moreInfo
].
s := selector.
(cls := aClass) isNil ifTrue:[
- cls := self containingClass
+ cls := self containingClass
].
- self package ~= cls package ifTrue:[
- s := s , ' [' , (self package asText emphasizeAllWith:#italic), ']'
+ (cls isNil or:[self package ~= cls package]) ifTrue:[
+ s := s , ' [' , (self package asText emphasizeAllWith:#italic), ']'
].
moreInfo size == 0 ifTrue:[^ s].
@@ -1817,7 +1817,7 @@
s := selector , moreInfo.
self isInvalid ifTrue:[
- s := s asText emphasizeAllWith:#color->Color red.
+ s := s asText emphasizeAllWith:#color->Color red.
].
^ s
@@ -2738,6 +2738,6 @@
!Method class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.197 2000-08-15 14:34:33 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.198 2000-08-17 14:01:48 cg Exp $'
! !
Method initialize!