--- a/Explainer.st Wed Feb 06 11:34:13 2002 +0100
+++ b/Explainer.st Wed Feb 06 11:46:06 2002 +0100
@@ -271,50 +271,51 @@
explainGlobal:string inClass:aClass short:shortText
"return explanation or nil"
- |sym stringText tmp val|
+ |sym stringText tmp val classCategory|
- sym := string asSymbolIfInterned.
+ "if not even known as key, its definitely not a global"
+ sym := string asSymbolIfInterned.
sym isNil ifTrue:[^ nil].
"try globals"
+ (Smalltalk includesKey:sym) ifFalse:[ ^ nil].
stringText := string allBold.
- (Smalltalk includesKey:sym) ifTrue:[
- "/ stringText := '''' , stringText , ''''.
- tmp := stringText , ' is a global variable.'.
- val := Smalltalk at:sym.
- val isBehavior ifTrue:[
- "/ a class
- shortText ifTrue:[
- ^ stringText , ' is ' , (val isLoaded ifTrue:['a'] ifFalse:['an autoloaded'])
-, ' class in the ''' , val category , ''' category.'.
- ].
+ "/ stringText := '''' , stringText , ''''.
+ tmp := stringText , ' is a global variable.'.
- val name = string ifTrue:[
- tmp := tmp , '
-' , string , ' is ' , (val isLoaded ifTrue:['a'] ifFalse:['an autoloaded'])
-, ' class categorized as ' , val category , '
-in the ''' , val package , ''' package.'.
- ^ tmp.
- ].
+ val := Smalltalk at:sym.
+ val isBehavior ifTrue:[
+ "/ a class
+ classCategory := val category.
+ shortText ifTrue:[
+ ^ stringText , ' is ' , (val isLoaded ifTrue:['a'] ifFalse:['an autoloaded'])
+, ' class in the ''' , classCategory , ''' category.'.
+ ].
+
+ val name = string ifTrue:[
tmp := tmp , '
-
-' , string , ' is bound to the class ' , val name ,
-' in category ' , val category , '.'.
+' , string , ' is ' , (val isLoaded ifTrue:['a'] ifFalse:['an autoloaded'])
+, ' class categorized as ' , classCategory , '
+in the ''' , val package , ''' package.'.
^ tmp.
].
- shortText ifTrue:[
- ^ stringText , ' is ' , ' a global, currently bound to ' , val classNameWithArticle , '.'.
- ].
tmp := tmp , '
-Its current value is ' , val classNameWithArticle , '.'.
+' , string , ' is bound to the class ' , val name ,
+' in the ''' , classCategory , ''' category.'.
^ tmp.
].
- ^ nil
+ shortText ifTrue:[
+ ^ stringText , ' is a global, currently bound to ''' , val classNameWithArticle , '''.'.
+ ].
+ tmp := tmp , '
+
+Its current value is ''' , val classNameWithArticle , '''.'.
+ ^ tmp.
!
explainHereIn:aClass
@@ -847,5 +848,5 @@
!Explainer class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.49 2002-02-06 10:34:13 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.50 2002-02-06 10:46:06 cg Exp $'
! !