Parser.st
changeset 1285 32af9747bf9d
parent 1282 14b97cbd6eec
child 1286 b21dfcad59a6
--- a/Parser.st	Fri Jul 05 16:52:39 2002 +0200
+++ b/Parser.st	Thu Jul 11 23:28:09 2002 +0200
@@ -2145,12 +2145,12 @@
 
     "in systems without widgets ..."
     ListSelectionBox isNil ifTrue:[
-	^ self confirm:aString
+        ^ self confirm:aString
     ].
     box := ListSelectionBox title:aString.
     box initialText:(aList at:1).
     box list:aList.
-    box okText:'correct'.
+    box okText:'Correct'.
     box action:[:aString | ^ aString].
     box showAtPointer.
     ^ nil
@@ -2348,7 +2348,7 @@
      or a ParseNode as returned by variable"
 
     |correctIt varName suggestedNames newName pos1 pos2 rslt
-     varNameIsLowercase l how choice holder undeclared newClass|
+     varNameIsLowercase l how choice holder undeclared newClass boldName|
 
     pos1 := tokenPosition.
     varName := tokenName.
@@ -2374,12 +2374,13 @@
 
         "/ lowerCase vars are added to the Undeclared dictionary,
         "/ allowing easy search for bad-spots later.
+        boldName := varName allBold.
 
         varNameIsLowercase ifTrue:[
             undeclared := Smalltalk at:#Undeclared.
             ((undeclared notNil)
             and:[(undeclared includes:varName asSymbol)]) ifFalse:[ 
-                self warning:('adding ''' , varName , ''' as Undeclared.\\Remember to fix that later.') withCRs position:pos1 to:pos2.
+                self warning:('Adding ''' , boldName , ''' as Undeclared.\\Remember to fix that later.') withCRs position:pos1 to:pos2.
             ].
             ^ self defineAsUndeclaredVariable:varName
         ].
@@ -2387,7 +2388,7 @@
         "/ upperCase vars are declared as global
         (warnedUndefVars isNil or:[(warnedUndefVars includes:varName) not]) ifTrue:[
             (warnedUnknownNamespaces isNil or:[(warnedUnknownNamespaces includes:varName) not]) ifTrue:[
-                self warning:('adding ''' , varName , ''' as Global.') withCRs position:pos1 to:pos2.
+                self warning:('adding ''' , boldName , ''' as Global.') withCRs position:pos1 to:pos2.
             ].
         ].
         ^ VariableNode type:#GlobalVariable name:(varName asSymbol)
@@ -2537,11 +2538,11 @@
 
     suggestedNames := self findBestVariablesFor:varName.
     suggestedNames isNil ifTrue:[
-        self information:'no good correction found'.
+        self information:'No good correction found'.
         ^ #Error
     ].
 
-    newName := self askForCorrection:'correct variable to: ' fromList:suggestedNames.
+    newName := self askForCorrection:'Correct Variable to: ' fromList:suggestedNames.
     newName isNil ifTrue:[^ #Error].
 "
         newName := suggestedNames at:1.
@@ -3135,7 +3136,7 @@
      corrected. If not corrected, only one warning is made per undefined
      variable."
 
-    |doCorrect msg idx|
+    |doCorrect msg idx boldName|
 
     warnUndeclared ifFalse:[^ false].
     ignoreWarnings ifTrue:[^ false].
@@ -3157,9 +3158,11 @@
 "/      ^ false
 "/    ].
 
+    boldName := aName allBold.
+
     (requestor isNil or:[requestor isStream]) ifTrue:[
         aName first isUppercase ifFalse:[
-            self showErrorMessage:('Error: ''' , aName , ''' is undefined') position:pos1.
+            self showErrorMessage:('Error: ''' , boldName , ''' is undefined') position:pos1.
         ].
         doCorrect := false.
     ] ifFalse:[
@@ -3168,19 +3171,19 @@
          it is supposed to raise abort or return true/false.
          True return means that correction is wanted.
         "
-        msg := 'Warning: ''' , aName , ''' is undefined'.
+        msg := 'Warning: ''' , boldName , ''' is undefined'.
         classToCompileFor notNil ifTrue:[
             "/ is it an instance-variable marked inaccessable ?
 
             idx := (self classesInstVarNames) indexOf:(aName , '*') startingAt:1.
             idx ~~ 0 ifTrue:[
-                msg := 'Warning: ' , aName , ' is a hidden instvar (not accessable from ST-code)'.
+                msg := 'Warning: ''' , boldName , ''' is a hidden instvar (not accessable from ST-code)'.
             ].
 
             "/ is it an instance variable, while evaluateing for the class ?
             classToCompileFor isMeta ifTrue:[
                 (classToCompileFor soleInstance allInstVarNames includes:aName) ifTrue:[
-                    msg := 'Warning: ' , aName , ' is an instvar\(hint: you are evaluating/compiling in the classes context)' withCRs.
+                    msg := 'Warning: ''' , boldName , ''' is an instvar\(hint: you are evaluating/compiling in the classes context)' withCRs.
                 ]
             ]
         ].
@@ -6571,6 +6574,6 @@
 !Parser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.338 2002-06-21 07:40:57 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.339 2002-07-11 21:28:09 cg Exp $'
 ! !
 Parser initialize!