hg/stx-libbasic: comparison Class.st

equal deleted inserted replaced

-:fc2ff98b99f7
+:9ce8fd84ebe8
 ].
 ^ nil
 "Created: 15.11.1995 / 14:58:35 / cg"
 "Modified: 13.12.1995 / 17:11:28 / cg"
+!
+revisionStringFromSource:aMethodSourceString
+"extract a revision string from a methods source string"
+|lines|
+lines := aMethodSourceString asCollectionOfLines.
+lines do:[:l |
+|i|
+i := l indexOfSubCollection:'$Header: '.
+i ~~ 0 ifTrue:[
+^ l copyFrom:i
+]
+].
+^ nil
+"Created: 15.10.1996 / 18:57:57 / cg"
 ! !
 !Class class methodsFor:'queries'!
 isBuiltInClass
 classFilename
 "return the name of the file from which the class was compiled.
 This is currently NOT used."
+|owner|
+(owner := self owningClass) notNil ifTrue:[^ owner classFilename].
 ^ classFilename
+"Modified: 15.10.1996 / 18:53:21 / cg"
 !
 classVarAt:aSymbol
 "return the value of a class variable.
 Currently, this returns nil if there is no such classvar -
 !
 package
 "return the package of the class"
+|owner|
+(owner := self owningClass) notNil ifTrue:[^ owner package].
 ^ package
 "
 Object package
 "
+"Modified: 15.10.1996 / 18:53:36 / cg"
 !
 package:aStringOrSymbol
 "set the package of the class."
 sourceCodeManager
 "return my source code manager.
 For now, all classes return the same global manager.
 But future versions may support mixed reporitories"
+|owner|
+(owner := self owningClass) notNil ifTrue:[^ owner sourceCodeManager].
 ^ Smalltalk at:#SourceCodeManager
 "Created: 7.12.1995 / 13:16:46 / cg"
-"Modified: 1.10.1996 / 15:47:35 / cg"
+"Modified: 15.10.1996 / 18:54:02 / cg"
 ! !
 !Class methodsFor:'adding/removing'!
 addSelector:newSelector withMethod:newMethod
 Class new isClass
 "
 !
 owningClass
+"return my owning class - nil if I am a public class"
 ^ self class owningClass
 "Created: 11.10.1996 / 18:45:59 / cg"
-"Modified: 12.10.1996 / 20:11:28 / cg"
+"Modified: 15.10.1996 / 18:54:56 / cg"
 !
 wasAutoloaded
 "return true, if this class came into the system via an
 autoload; false otherwise.
 "return the revision-ID from which the class was stc-compiled;
 nil if its an autoloaded or filedIn class.
 If a classes binary is up-to-date w.r.t. the source repository,
 the returned string is the same as the one returned by #revision."
+|owner|
+(owner := self owningClass) notNil ifTrue:[^ owner binaryRevision].
 self isMeta ifTrue:[
 ^ self soleInstance binaryRevision
 ].
 ^ revision
 select:[:cls | cls binaryRevision notNil and:[cls binaryRevision ~= cls revision]].
 SystemBrowser browseClasses:classes title:'classes which are not up-to-date'
 "
 "Created: 7.12.1995 / 10:58:47 / cg"
-"Modified: 9.2.1996 / 17:04:39 / cg"
+"Modified: 15.10.1996 / 18:55:28 / cg"
 !
 packageSourceCodeInfo
 "return the sourceCodeInfo, which defines the module and the subdirectory
 in which the receiver class was built.
 the directory info defaults to library name.
 The library name may not be left blank.
 (this is done for backward compatibility,)
 For example:
-	'....(libbasic)'                         -> module: stx directory: libbasic library: libbasic
+'....(libbasic)'                         -> module: stx directory: libbasic library: libbasic
-	'....(stx:libbasic)'                     -> module: stx directory: libbasic library: libbasic
+'....(stx:libbasic)'                     -> module: stx directory: libbasic library: libbasic
-	'....(aeg:libIECInterface)'              -> module: aeg directory: libIECInterface library:libIECInterface
+'....(aeg:libIECInterface)'              -> module: aeg directory: libIECInterface library:libIECInterface
-	'....(stx:goodies/persistency:libdbase)' -> module: stx directory: goodies/persistency library:libdbase
+'....(stx:goodies/persistency:libdbase)' -> module: stx directory: goodies/persistency library:libdbase
 The way how the sourceCodeManager uses this to find the source location
 depends on the scheme used. For CVS, the module is taken as the -d arg,
 while the directory is prepended to the file name.
 Other schemes may do things differently - these are not yet specified.
 Caveat:
-	Encoding this info in the package string seems somewhat kludgy.
+Encoding this info in the package string seems somewhat kludgy.
 "
-|sourceInfo packageString idx1 idx2
+|owner sourceInfo packageString idx1 idx2
 moduleString directoryString libraryString components|
+(owner := self owningClass) notNil ifTrue:[^ owner packageSourceCodeInfo].
 package isNil ifTrue:[^ nil].
 packageString := package asString.
 idx1 := packageString lastIndexOf:$(.
 idx1 ~~ 0 ifTrue:[
-	idx2 := packageString indexOf:$) startingAt:idx1+1.
+idx2 := packageString indexOf:$) startingAt:idx1+1.
-	idx2 ~~ 0 ifTrue:[
+idx2 ~~ 0 ifTrue:[
-	    sourceInfo := packageString copyFrom:idx1 + 1 to:idx2 - 1
+sourceInfo := packageString copyFrom:idx1 + 1 to:idx2 - 1
-	]
+]
 ].
 sourceInfo isNil ifTrue:[^ nil].
 components := sourceInfo asCollectionOfSubstringsSeparatedBy:$:.
 components size == 0 ifTrue:[
-	moduleString := 'stx'.
+moduleString := 'stx'.
-	directoryString := libraryString := ''.
+directoryString := libraryString := ''.
-	^ nil
+^ nil
 ] ifFalse:[
-	components size == 1 ifTrue:[
+components size == 1 ifTrue:[
-	    "/ a single name given - the module becomes 'stx',
+"/ a single name given - the module becomes 'stx',
-	    "/ if the component includes slashes, its the directory
+"/ if the component includes slashes, its the directory
-	    "/ otherwise the library
+"/ otherwise the library
-	    "/
+"/
-	    moduleString := 'stx'.
+moduleString := 'stx'.
-	    directoryString := libraryString := components at:1.
+directoryString := libraryString := components at:1.
-	    (libraryString includes:$/) ifTrue:[
+(libraryString includes:$/) ifTrue:[
-		libraryString := libraryString asFilename baseName
+libraryString := libraryString asFilename baseName
-	    ]
+]
-	] ifFalse:[
+] ifFalse:[
-	    components size == 2 ifTrue:[
+components size == 2 ifTrue:[
-		"/ two components - assume its the module and the directory;
+"/ two components - assume its the module and the directory;
-		"/ the library is assumed to be named after the directory
+"/ the library is assumed to be named after the directory
-		"/ except, if slashes are in the name; then the libraryname
+"/ except, if slashes are in the name; then the libraryname
-		"/ is the last component.
+"/ is the last component.
-		"/
+"/
-		moduleString := components at:1.
+moduleString := components at:1.
-		directoryString := libraryString := components at:2.
+directoryString := libraryString := components at:2.
-		(libraryString includes:$/) ifTrue:[
+(libraryString includes:$/) ifTrue:[
-		    libraryString := libraryString asFilename baseName
+libraryString := libraryString asFilename baseName
-		]
+]
-	    ] ifFalse:[
+] ifFalse:[
-		"/ all components given
+"/ all components given
-		moduleString := components at:1.
+moduleString := components at:1.
-		directoryString := components at:2.
+directoryString := components at:2.
-		libraryString := components at:3.
+libraryString := components at:3.
-	    ]
+]
-	]
+]
 ].
 libraryString isEmpty ifTrue:[
-	directoryString notEmpty ifTrue:[
+directoryString notEmpty ifTrue:[
-	    libraryString := directoryString asFilename baseName
+libraryString := directoryString asFilename baseName
-	].
+].
-	libraryString isEmpty ifTrue:[
+libraryString isEmpty ifTrue:[
-	    "/ lets extract the library from the liblist file ...
+"/ lets extract the library from the liblist file ...
-	    libraryString := Smalltalk libraryFileNameOfClass:self.
+libraryString := Smalltalk libraryFileNameOfClass:self.
-	    libraryString isNil ifTrue:[^ nil].
+libraryString isNil ifTrue:[^ nil].
-	]
+]
 ].
 moduleString isEmpty ifTrue:[
-	moduleString := 'stx'.
+moduleString := 'stx'.
 ].
 directoryString isEmpty ifTrue:[
-	directoryString := libraryString.
+directoryString := libraryString.
 ].
 ^ IdentityDictionary
-	with:(#module->moduleString)
+with:(#module->moduleString)
-	with:(#directory->directoryString)
+with:(#directory->directoryString)
-	with:(#library->libraryString)
+with:(#library->libraryString)
 "
 Object packageSourceCodeInfo
 View packageSourceCodeInfo
 Model packageSourceCodeInfo
 MemoryMonitor packageSourceCodeInfo
 ClockView packageSourceCodeInfo
 "
 "Created: 4.11.1995 / 20:36:53 / cg"
-"Modified: 7.2.1996 / 14:26:31 / cg"
+"Modified: 15.10.1996 / 18:56:03 / cg"
 !
 revision
 "return the revision-ID of the class which corresponds to the
 rcs-id of the source to which this class is equivalent.
 revisionInfo
 "return a dictionary filled with revision info.
 This extracts the relevant info from the revisionString.
 The revisionInfo contains all or a subset of:
-	#binaryRevision - the revision upon which the binary of this class is based
+#binaryRevision - the revision upon which the binary of this class is based
-	#revision       - the revision upon which the class is based logically
+#revision       - the revision upon which the class is based logically
-			  (different, if a changed class was checked in, but not yet recompiled)
+(different, if a changed class was checked in, but not yet recompiled)
-	#user           - the user who checked in the logical revision
+#user           - the user who checked in the logical revision
-	#date           - the date when the logical revision was checked in
+#date           - the date when the logical revision was checked in
-	#time           - the time when the logical revision was checked in
+#time           - the time when the logical revision was checked in
-	#fileName       - the classes source file name
+#fileName       - the classes source file name
-	#repositoryPath - the classes source container
+#repositoryPath - the classes source container
 "
 |vsnString info|
 vsnString := self revisionString.
 vsnString notNil ifTrue:[
-	info := Class revisionInfoFromString:vsnString.
+info := Class revisionInfoFromString:vsnString.
-	info notNil ifTrue:[
+info notNil ifTrue:[
-	    info at:#binaryRevision put:revision.
+info at:#binaryRevision put:revision.
-	]
+]
 ].
 ^ info
 "
 Object revisionString
 Object revisionInfo
 Image revisionInfo
 "
 "Created: 11.11.1995 / 14:27:20 / cg"
-"Modified: 9.12.1995 / 21:35:26 / cg"
+"Modified: 15.10.1996 / 18:56:44 / cg"
 !
 revisionString
 "return my revision string; that one is extracted from the
 classes #version method. Either this is a method returning that string,
 or its a comment-only method and the comment defines the version.
 If the source is not accessable or no such method exists,
 nil is returned."
-|cls meta m src val|
+|owner cls meta m src val|
+(owner := self owningClass) notNil ifTrue:[^ owner revisionString].
 thisContext isRecursive ifTrue:[^ nil ].
 self isMeta ifTrue:[
 meta := self. cls := self soleInstance
 "/ in case we need to access the source code manager
 "/ for the source ...
 "/
 src := m source.
 src isNil ifTrue:[^ nil].
-^ self revisionStringFromSource:src
+^ self class revisionStringFromSource:src
 "
 Smalltalk allClassesDo:[:cls |
 Transcript showCR:cls revisionString
 ].
 Number revisionString
 FileDirectory revisionString
 "
 "Created: 29.10.1995 / 19:28:03 / cg"
-"Modified: 18.3.1996 / 15:39:36 / cg"
+"Modified: 15.10.1996 / 18:57:43 / cg"
-!
-revisionStringFromSource:aMethodSourceString
-"extract a revision string from a methods source string"
-|lines|
-lines := aMethodSourceString asCollectionOfLines.
-lines do:[:l |
-	|i|
-	i := l indexOfSubCollection:'$Header: '.
-	i ~~ 0 ifTrue:[
-	    ^ l copyFrom:i
-	]
-].
-^ nil
 !
 setBinaryRevision:aString
 "set the revision-ID.
 This should normally not be done in the running system, as the source-manager
 !
 sourceStream
 "return an open stream on my sourcefile, nil if that is not available"
-|source cls|
+|owner source cls|
+(owner := self owningClass) notNil ifTrue:[^ owner sourceStream].
 self isMeta ifTrue:[
-	cls := self soleInstance
+cls := self soleInstance
 ] ifFalse:[
-	cls := self
+cls := self
 ].
 classFilename notNil ifTrue:[
-	source := classFilename
+source := classFilename
 ] ifFalse:[
-	source := (Smalltalk fileNameForClass:cls) , '.st'
+source := (Smalltalk fileNameForClass:cls) , '.st'
 ].
 ^ cls sourceStreamFor:source
+"Modified: 15.10.1996 / 18:59:40 / cg"
 !
 sourceStreamFor:source
 "return an open stream on a sourcefile, nil if that is not available"
-|fileName aStream mgr|
+|owner fileName aStream mgr|
+(owner := self owningClass) notNil ifTrue:[^ owner sourceStreamFor:source].
 "/
 "/ if there is no SourceCodeManager,
 "/ or TryLocalSourceFirst is true,
 "/ look in standard places first
 Clock sourceStream
 Autoload sourceStream
 "
 "Created: 10.11.1995 / 21:05:13 / cg"
-"Modified: 12.10.1996 / 17:21:10 / cg"
+"Modified: 15.10.1996 / 18:59:53 / cg"
 !
 updateVersionMethodFor:newRevisionString
 "helper for the checkin procedure.
 Update my #version method, to now return newRevisionString."
 |cls "vs m mgr"|
 cls := self.
 self isMeta ifFalse:[
-	cls := self class
+cls := self class
 ].
 "/    m := cls compiledMethodAt:#version.
 "/    m isNil ifTrue:[^ false].
 "/    vs := self revisionString.
 "/    vs isNil ifTrue:[^ false].
 "/
 "/    (mgr := self sourceCodeManager) isNil ifTrue:[^ false].
 "/    newString := mgr updatedRevisionStringOf:cls forRevision:newRevision with:vs.
 "/    newString isNil ifTrue:[^ false].
 Class withoutUpdatingChangesDo:[
-	Compiler compile:'version
+Compiler compile:'version
 ^ ''' , newRevisionString , '''
 '
-		 forClass:cls inCategory:#documentation notifying:nil
+forClass:cls inCategory:#documentation notifying:nil
-		     install:true skipIfSame:false silent:true.
+install:true skipIfSame:false silent:true.
 ].
 "/ ('updated to :' , newRevisionString) printNL.
 ^ true
 "Created: 7.12.1995 / 20:42:22 / cg"
-"Modified: 7.12.1995 / 23:34:43 / cg"
+"Modified: 15.10.1996 / 18:59:58 / cg"
 ! !
 !Class class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.186 1996-10-15 11:29:55 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.187 1996-10-15 18:00:43 cg Exp $'
 ! !
 Class initialize!

changeset 1754	9ce8fd84ebe8
parent 1753	fc2ff98b99f7
child 1756	d2518afa9df8