--- a/Smalltalk.st Wed Feb 14 10:24:40 2001 +0100
+++ b/Smalltalk.st Wed Feb 14 17:12:34 2001 +0100
@@ -3139,97 +3139,96 @@
"/ on the fly, update the abbreviations
CachedAbbreviations isNil ifTrue:[
- CachedAbbreviations := IdentityDictionary new.
+ CachedAbbreviations := IdentityDictionary new.
].
abbrevs := CachedAbbreviations.
KnownPackages isNil ifTrue:[
- KnownPackages := Set new.
+ KnownPackages := Set new.
].
"/ yes, create any required nameSpace, without asking user.
Class createNameSpaceQuerySignal answer:true do:[
- [anAbbrevFileStream atEnd] whileFalse:[
- l := anAbbrevFileStream nextLine withoutSeparators.
- l notEmpty ifTrue:[
- "/ must do it manually, caring for quoted strings.
+ [anAbbrevFileStream atEnd] whileFalse:[
+ l := anAbbrevFileStream nextLine withoutSeparators.
+ l notEmpty ifTrue:[
+ "/ must do it manually, caring for quoted strings.
"/ words := line asCollectionOfWords.
- words := OrderedCollection new.
- s2 := l readStream.
- [s2 atEnd] whileFalse:[
- s2 skipSeparators.
- s2 peek == $' ifTrue:[
- s2 next.
- w := s2 upTo:$'.
- s2 skipSeparators.
- ] ifFalse:[
- w := s2 upToSeparator
- ].
- words add:w
- ].
- words size < 3 ifTrue:[
- 'Smalltalk [warning]: bad abbrev entry' errorPrint.
- anAbbrevFileStream isFileStream ifTrue:[
- ' (in ''' errorPrint.
- anAbbrevFileStream pathName errorPrint.
- ''')' errorPrint
- ].
- ': ' errorPrint. l errorPrintCR
- ] ifFalse:[
- clsName := (words at:1) asSymbol.
- abbrev := (words at:2).
- package := (words at:3) asSymbol.
+ words := OrderedCollection new.
+ s2 := l readStream.
+ [s2 atEnd] whileFalse:[
+ s2 skipSeparators.
+ s2 peek == $' ifTrue:[
+ s2 next.
+ w := s2 upTo:$'.
+ s2 skipSeparators.
+ ] ifFalse:[
+ w := s2 upToSeparator
+ ].
+ words add:w
+ ].
+ words size < 3 ifTrue:[
+ 'Smalltalk [warning]: bad abbrev entry' errorPrint.
+ anAbbrevFileStream isFileStream ifTrue:[
+ ' (in ''' errorPrint.
+ anAbbrevFileStream pathName errorPrint.
+ ''')' errorPrint
+ ].
+ ': ' errorPrint. l errorPrintCR
+ ] ifFalse:[
+ clsName := (words at:1) asSymbol.
+ abbrev := (words at:2).
+ package := (words at:3) asSymbol.
"/ KnownPackages add:package.
- cat := words at:4 ifAbsent:nil.
-
- (cat size == 0) ifTrue:[
- cat := 'autoloaded'
- ].
-
- "/ on the fly, update the abbreviations
- clsName ~= abbrev ifTrue:[
- nameKey := clsName asSymbol.
- oldAbbrev := abbrevs at:nameKey ifAbsent:nil.
- oldAbbrev notNil ifTrue:[
- oldAbbrev ~= abbrev ifTrue:[
- StandAlone ifFalse:[
- ('Smalltalk [warning]: conflict for: ' , clsName , ' in ' , (anAbbrevFileStream pathName)) infoPrintCR.
- ('Smalltalk [warning]: (' , oldAbbrev , ' <-> ' , abbrev , ')') infoPrintCR
- ]
- ].
- ] ifFalse:[
- cls := self classNamed:abbrev.
-
- cls notNil ifTrue:[
- cls name ~= clsName ifTrue:[
- "/ ok, there is a class named after this abbrev ...
- "/ this is only a conflict, if the other class has no
- "/ abbreviation (or the same).
- (abbrevs at:(cls name asSymbol) ifAbsent:cls name) = abbrev ifTrue:[
- cls isNameSpace ifFalse:[
- package = cls package ifTrue:[
- StandAlone ifFalse:[
- ('Smalltalk [warning]: conflict for: ' , cls name , ' in ' , (anAbbrevFileStream pathName)) infoPrintCR.
- ('Smalltalk [warning]: (' , clsName , ' -> ' , abbrev , ')') infoPrintCR
- ]
- ]
- ]
- ]
- ]
- ].
- abbrevs at:clsName asSymbol put:abbrev.
- ]
- ].
-
- "/ ' autoloaded: ' print. clsName print. ' in ' print. cat printCR.
-
- self installAutoloadedClassNamed:clsName category:cat package:package revision:rev.
- ]
- ]
- ]
+ cat := words at:4 ifAbsent:nil.
+
+ (cat size == 0) ifTrue:[
+ cat := 'autoloaded'
+ ].
+
+ "/ on the fly, update the abbreviations
+ clsName ~= abbrev ifTrue:[
+ nameKey := clsName asSymbol.
+ oldAbbrev := abbrevs at:nameKey ifAbsent:nil.
+ (oldAbbrev notNil and:[oldAbbrev ~= abbrev]) ifTrue:[
+ StandAlone ifFalse:[
+ ('Smalltalk [warning]: conflict for: ' , clsName , ' in ' , (anAbbrevFileStream pathName)) infoPrintCR.
+ ('Smalltalk [warning]: (' , oldAbbrev , ' <-> ' , abbrev , ')') infoPrintCR
+ ].
+ abbrevs at:nameKey put:abbrev.
+ ] ifFalse:[
+ cls := self classNamed:abbrev.
+
+ cls notNil ifTrue:[
+ cls name ~= clsName ifTrue:[
+ "/ ok, there is a class named after this abbrev ...
+ "/ this is only a conflict, if the other class has no
+ "/ abbreviation (or the same).
+ (abbrevs at:(cls name asSymbol) ifAbsent:cls name) = abbrev ifTrue:[
+ cls isNameSpace ifFalse:[
+ package = cls package ifTrue:[
+ StandAlone ifFalse:[
+ ('Smalltalk [warning]: conflict for: ' , cls name , ' in ' , (anAbbrevFileStream pathName)) infoPrintCR.
+ ('Smalltalk [warning]: (' , clsName , ' -> ' , abbrev , ')') infoPrintCR
+ ]
+ ]
+ ]
+ ]
+ ]
+ ].
+ abbrevs at:clsName asSymbol put:abbrev.
+ ]
+ ].
+
+ "/ ' autoloaded: ' print. clsName print. ' in ' print. cat printCR.
+
+ self installAutoloadedClassNamed:clsName category:cat package:package revision:rev.
+ ]
+ ]
+ ]
]
!
@@ -5950,5 +5949,5 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.485 2001-02-09 13:52:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.486 2001-02-14 16:12:34 cg Exp $'
! !