--- a/Class.st Wed Apr 22 18:04:59 1998 +0200
+++ b/Class.st Wed Apr 22 19:21:29 1998 +0200
@@ -3675,80 +3675,80 @@
"/
((mgr := self sourceCodeManager) isNil
or:[TryLocalSourceFirst == true]) ifTrue:[
- aStream := self localSourceStreamFor:source.
+ aStream := self localSourceStreamFor:source.
].
aStream isNil ifTrue:[
- "/
- "/ hard case - there is no source file for this class
- "/ (in the source-dir-path).
- "/
-
- "/
- "/ look if my binary is from a dynamically loaded module,
- "/ and, if so, look in the modules directory for the
- "/ source file.
- "/
- ObjectFileLoader notNil ifTrue:[
- ObjectFileLoader loadedObjectHandlesDo:[:h |
- |f classes|
-
- aStream isNil ifTrue:[
- (classes := h classes) notNil ifTrue:[
- (classes includes:self) ifTrue:[
- f := h pathName.
- f := f asFilename directory.
- f := f construct:source.
- f exists ifTrue:[
- aStream := f readStream.
- ].
- ].
- ].
- ]
- ].
- ].
+ "/
+ "/ hard case - there is no source file for this class
+ "/ (in the source-dir-path).
+ "/
+
+ "/
+ "/ look if my binary is from a dynamically loaded module,
+ "/ and, if so, look in the modules directory for the
+ "/ source file.
+ "/
+ ObjectFileLoader notNil ifTrue:[
+ ObjectFileLoader loadedObjectHandlesDo:[:h |
+ |f classes|
+
+ aStream isNil ifTrue:[
+ (classes := h classes) notNil ifTrue:[
+ (classes includes:self) ifTrue:[
+ f := h pathName.
+ f := f asFilename directory.
+ f := f construct:source.
+ f exists ifTrue:[
+ aStream := f readStream.
+ ].
+ ].
+ ].
+ ]
+ ].
+ ].
].
aStream isNil ifTrue:[
- "/ mhmh - still no source file.
- "/ If there is a SourceCodeManager, ask it to aquire the
- "/ the source for my class, and return an open stream on it.
- "/ if that one does not know about the source, look in
- "/ standard places
-
- mgr notNil ifTrue:[
- aStream := mgr getSourceStreamFor:self.
- aStream notNil ifTrue:[
- (self validateSourceStream:aStream) ifFalse:[
- ('Class [info]: repositories source for `'
- , (self isMeta ifTrue:[self soleInstance name]
- ifFalse:[name])
- , ''' is invalid.') infoPrintCR.
- aStream close.
- aStream := nil
- ] ifTrue:[
- validated := true.
- ].
- ].
-
- aStream isNil ifTrue:[
- aStream := self localSourceStreamFor:source.
- ].
- ].
-
- "/
- "/ final chance: try current directory
- "/
- aStream isNil ifTrue:[
- aStream := source asFilename readStream.
- ].
+ "/ mhmh - still no source file.
+ "/ If there is a SourceCodeManager, ask it to aquire the
+ "/ the source for my class, and return an open stream on it.
+ "/ if that one does not know about the source, look in
+ "/ standard places
+
+ mgr notNil ifTrue:[
+ aStream := mgr getSourceStreamFor:self.
+ aStream notNil ifTrue:[
+ (self validateSourceStream:aStream) ifFalse:[
+ ('Class [info]: repositories source for `'
+ , (self isMeta ifTrue:[self soleInstance name]
+ ifFalse:[name])
+ , ''' is invalid.') infoPrintCR.
+ aStream close.
+ aStream := nil
+ ] ifTrue:[
+ validated := true.
+ ].
+ ].
+
+ aStream isNil ifTrue:[
+ aStream := self localSourceStreamFor:source.
+ ].
+ ].
+
+ "/
+ "/ final chance: try current directory
+ "/
+ aStream isNil ifTrue:[
+ aStream := source asFilename readStream.
+ ].
].
(aStream notNil and:[validated not]) ifTrue:[
- (self validateSourceStream:aStream) ifFalse:[
- ('Class [warning]: source for ''' , self name , ''' is invalid. Take care.') errorPrintCR
- ].
+ (self validateSourceStream:aStream) ifFalse:[
+ ('Class [warning]: source for ''' , self name , ''' is invalid or stripped. Take care.') errorPrintCR
+ ].
].
^ aStream
@@ -3758,8 +3758,9 @@
Autoload sourceStream
"
- "Created: 10.11.1995 / 21:05:13 / cg"
- "Modified: 10.1.1997 / 15:36:26 / cg"
+ "Created: / 10.11.1995 / 21:05:13 / cg"
+ "Modified: / 10.1.1997 / 15:36:26 / cg"
+ "Modified: / 22.4.1998 / 19:20:50 / ca"
!
updateVersionMethodFor:newRevisionString
@@ -3915,5 +3916,5 @@
!Class class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.307 1998-04-22 16:04:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.308 1998-04-22 17:21:29 cg Exp $'
! !