hg/stx-libbasic: comparison Class.st

equal deleted inserted replaced

-:2f75076b5597
+:d777721e42c8
 self wasAutoloaded ifFalse:[
 "
 can it be done ?
 (all of my methods must have a source)
 "
-self allSelectorsAndMethodsDo:[:sel :aMethod |
+self instAndClassSelectorsAndMethodsDo:[:sel :aMethod |
 aMethod source isNil ifTrue:[^false].
 aMethod hasPrimitiveCode ifTrue:[^ false].
 ].
 ].
 owner notNil ifTrue:[
 newClass setCategory:nil.
 ] ifFalse:[
 newClass setPackage:package.
 ].
-newClass allSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:package].
+newClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:package].
 newClass methodDictionary:methods.
 newClass class methodDictionary:cmethods.
 newClass initializeWithAllPrivateClasses.
 !
 basicFileOutDefinitionOn:aStream withNameSpace:forceNameSpace withPackage:showPackage
 "append an expression on aStream, which defines myself."
-|s owner ns nsName fullName superName cls topOwner
+|s owner ns nsName fullName superNameWithoutNameSpacePrefix cls topOwner
-syntaxHilighting|
+syntaxHilighting superclassNamespace|
 UserPreferences isNil ifTrue:[
 syntaxHilighting := false
 ] ifFalse:[
 syntaxHilighting := UserPreferences current syntaxColoring.
 ].
+fullName := FileOutNameSpaceQuerySignal query == true.
 owner := self owningClass.
 owner isNil ifTrue:[
 ns := self nameSpace.
 ] ifFalse:[
-ns := self topOwningClass nameSpace
+ns := self topOwningClass nameSpace.
 ].
-fullName := FileOutNameSpaceQuerySignal query == true.
 (showPackage and:[owner isNil]) ifTrue:[
 aStream nextPutAll:'"{ Package: '''.
 aStream nextPutAll:self package asString.
 aStream nextPutAll:''' }"'; cr; cr.
 ].
-((owner isNil and:[fullName not])
+"/ the backward compatible namespace directive is only used
-or:[owner notNil and:[forceNameSpace and:[fullName not]]]) ifTrue:[
+"/ for non-private classes.
-(ns notNil and:[ns ~~ Smalltalk]) ifTrue:[
+"/ Private classes cannot be filed into another smalltalk anyway,
-nsName := ns name.
+"/ and there is no need to complicate global lookup in stc...
-(nsName includes:$:) ifTrue:[
-nsName := '''' , nsName , ''''
+owner notNil ifTrue:[
-].
+fullName := true.
-"/            aStream nextPutLine:'"{ NameSpace: ' , nsName , ' }"'; cr.
+].
-aStream nextPutAll:'"{ NameSpace: '.
-syntaxHilighting ifTrue:[aStream bold].
+fullName ifFalse:[
-aStream nextPutAll:nsName.
+(owner isNil or:[forceNameSpace]) ifTrue:[
-syntaxHilighting ifTrue:[aStream normal].
+(ns notNil and:[ns ~~ Smalltalk]) ifTrue:[
-aStream nextPutAll:' }"'; cr; cr.
+nsName := ns name.
-]
+(nsName includes:$:) ifTrue:[
+nsName := '''' , nsName , ''''
+].
+aStream nextPutAll:'"{ NameSpace: '.
+syntaxHilighting ifTrue:[aStream bold].
+aStream nextPutAll:nsName.
+syntaxHilighting ifTrue:[aStream normal].
+aStream nextPutAll:' }"'; cr; cr.
+]
+].
 ].
 "take care of nil-superclass"
 superclass isNil ifTrue:[
 s := 'nil'
 ] ifFalse:[
+superclassNamespace := superclass nameSpace.
 fullName ifTrue:[
-superclass == owner ifTrue:[
+s := superclass name.
-s := superclass nameWithoutNameSpacePrefix
+"/            superclass == owner ifTrue:[
-] ifFalse:[
+"/                s := superclass nameWithoutNameSpacePrefix
-s := superclass name
+"/            ]
-]
 ] ifFalse:[
-(ns == superclass nameSpace
+(ns == superclassNamespace
 and:[superclass owningClass isNil]) ifTrue:[
 "/ superclass is in the same namespace;
 "/ still prepend namespace prefix, to avoid
 "/ confusing stc, which needs that information ...
 s := superclass nameWithoutPrefix
 "/ a very special (rare) situation:
 "/ my superclass resides in another nameSpace,
 "/ but there is something else named like this
 "/ to be found in my nameSpace (or a private class)
-superName := superclass nameWithoutNameSpacePrefix asSymbol.
+superNameWithoutNameSpacePrefix := superclass nameWithoutNameSpacePrefix asSymbol.
-cls := self privateClassesAt:superName.
+cls := self privateClassesAt:superNameWithoutNameSpacePrefix.
 cls isNil ifTrue:[
 (topOwner := self topOwningClass) isNil ifTrue:[
 ns := self nameSpace.
 ns notNil ifTrue:[
-cls := ns privateClassesAt:superName
+cls := ns privateClassesAt:superNameWithoutNameSpacePrefix
 ] ifFalse:[
 "/ self error:'unexpected nil namespace'
 ]
 ] ifFalse:[
-cls := topOwner nameSpace at:superName.
+cls := topOwner nameSpace at:superNameWithoutNameSpacePrefix.
 ]
 ].
 (cls notNil and:[cls ~~ superclass]) ifTrue:[
-s := superclass nameSpace name , '::' , superName
+s := superclassNamespace name , '::' , superNameWithoutNameSpacePrefix
 ] ifFalse:[
 "/ no class with that name found in my namespace ...
 "/ if the superclass resides in Smalltalk,
 "/ suppress prefix; otherwise, use full prefix.
-(superclass nameSpace notNil
+(superclassNamespace notNil
-and:[superclass nameSpace ~~ Smalltalk]) ifTrue:[
+and:[superclassNamespace ~~ Smalltalk]) ifTrue:[
 (owner notNil
 and:[owner nameSpace == superclass owningClass nameSpace])
 ifTrue:[
-s := superclass nameWithoutNameSpacePrefix
+s := superNameWithoutNameSpacePrefix
 ] ifFalse:[
 s := superclass name
 ]
 ] ifFalse:[
-s := superName
+s := superNameWithoutNameSpacePrefix
 ]
 ]
 ]
 ]
 ].
 fullName ifTrue:[
 s := owner name.
 ] ifFalse:[
 s := owner nameWithoutNameSpacePrefix.
 ].
-"/        s := owner nameWithoutNameSpacePrefix.
 aStream nextPutAll:s.
 syntaxHilighting ifTrue:[aStream normal].
 ].
 aStream cr
 "/ check carefully - maybe, my source does not really come from that
 "/ file (i.e. all of my methods have their source as string)
 anySourceRef := false.
-self methodDictionary do:[:m|
+self instAndClassMethodsDo:[:m |
-m sourcePosition notNil ifTrue:[
-anySourceRef := true
-]
-].
-self class methodDictionary do:[:m|
 m sourcePosition notNil ifTrue:[
 anySourceRef := true
 ]
 ].
 "/ the same as the written one AND the new files directory
 "/ is along the sourcePath, we also need a temporary file
 "/ first, to avoid accessing the newly written file.
 anySourceRef := false.
-self methodDictionary do:[:m|
+self instAndClassMethodsDo:[:m |
-|mSrc|
-(mSrc := m sourceFilename) notNil ifTrue:[
-mSrc asFilename baseName = fileName baseName ifTrue:[
-anySourceRef := true
-]
-]
-].
-self class methodDictionary do:[:m|
 |mSrc|
 (mSrc := m sourceFilename) notNil ifTrue:[
 mSrc asFilename baseName = fileName baseName ifTrue:[
 anySourceRef := true
 into the sourceCode repository. (extensions are stored separate)"
 |pkg|
 pkg := self package.
-self allSelectorsAndMethodsDo:[:sel :mthd |
+self instAndClassSelectorsAndMethodsDo:[:sel :mthd |
 mthd package ~= pkg ifTrue:[^ true].
 ].
 ^ false
 "
 "return true, if there are methods in the receiver, which belong to
 the package with aPackageID (i.e. package of class ~= package of method).
 Those are class extensions, which must be treated specially when checking classes
 into the sourceCode repository. (extensions are stored separate)"
-self allSelectorsAndMethodsDo:[:sel :mthd |
+self instAndClassSelectorsAndMethodsDo:[:sel :mthd |
 mthd package = aPackageID ifTrue:[^ true].
 ].
 ^ false
 "
 ! !
 !Class class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.399 2001-09-10 14:18:40 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.400 2001-10-08 09:17:34 cg Exp $'
 ! !

changeset 6077	d777721e42c8
parent 6023	63f7111fd2f9
child 6097	276766efb318