--- a/Metaclass.st Wed Jul 07 18:41:09 1999 +0200
+++ b/Metaclass.st Wed Jul 07 19:26:17 1999 +0200
@@ -1598,46 +1598,48 @@
|superInstVars msg|
aClass notNil ifTrue:[
- "
- check for instVar redef of superClass instVars
- "
- superInstVars := aClass allInstVarNames.
- stringOfInstVarNames asCollectionOfWords do:[:nm |
- (superInstVars includes:nm) ifTrue:[
- (oldClass notNil
- and:[stringOfInstVarNames = oldClass instanceVariableString])
- ifTrue:[
- msg := 'instVar conflict in `' , newName , ''' for `' , nm , ''' due to superclass change.\You now have two different instVar slots with the same name.\\Dont forget to fix this later.'.
- self warn:msg withCRs.
- ] ifFalse:[
- msg := 'instVar `' , nm , ''' is already defined in a superclass.\Change the definition of `' , newName , ''' anyway ?\\Notice: you must fix the superclass later.'.
- ^ self confirm:msg withCRs
- ].
- ]
- ].
+ "
+ check for instVar redef of superClass instVars
+ "
+ superInstVars := aClass allInstVarNames.
+ stringOfInstVarNames asCollectionOfWords do:[:nm |
+ (superInstVars includes:nm) ifTrue:[
+ (oldClass notNil
+ and:[stringOfInstVarNames = oldClass instanceVariableString])
+ ifTrue:[
+ Transcript showCR:('instVar conflict in `' , newName , ''' for `' , nm , ''' due to superclass change.').
+ msg := 'instVar conflict in `' , newName , ''' for `' , nm , ''' due to superclass change.\You now have two different instVar slots with the same name.\\Dont forget to fix this later.'.
+ self warn:msg withCRs.
+ ] ifFalse:[
+ Transcript showCR:('instVar `' , nm , ''' is already defined in a superclass of `' , newName , '''.').
+ msg := 'instVar `' , nm , ''' is already defined in a superclass.\Change the definition of `' , newName , ''' anyway ?\\Notice: you must fix the superclass later.'.
+ ^ self confirm:msg withCRs
+ ].
+ ]
+ ].
].
oldClass notNil ifTrue:[
- "
- check for instVar redefs in subclass instVars
- "
- oldClass allSubclassesDo:[:sub |
- |vars|
+ "
+ check for instVar redefs in subclass instVars
+ "
+ oldClass allSubclassesDo:[:sub |
+ |vars|
- vars := sub instVarNames.
- stringOfInstVarNames asCollectionOfWords do:[:nm |
- (vars includes:nm) ifTrue:[
- ^ self confirm:('subclass '
- , sub name
- , ' already defines an instVar named `'
- , nm
- , '''.\\Change the definition of `'
- , newName
- , ''' anyway ?\Notice: you must fix the subclass later.'
- ) withCRs
- ]
- ]
- ]
+ vars := sub instVarNames.
+ stringOfInstVarNames asCollectionOfWords do:[:nm |
+ (vars includes:nm) ifTrue:[
+ ^ self confirm:('subclass '
+ , sub name
+ , ' already defines an instVar named `'
+ , nm
+ , '''.\\Change the definition of `'
+ , newName
+ , ''' anyway ?\Notice: you must fix the subclass later.'
+ ) withCRs
+ ]
+ ]
+ ]
].
^ true
@@ -2024,6 +2026,6 @@
!Metaclass class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.144 1999-04-22 16:33:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.145 1999-07-07 17:26:17 cg Exp $'
! !
Metaclass initialize!