hg/stx-libbasic: comparison Class.st

equal deleted inserted replaced

-:cc3233554827
+:c4a27118cc2a
 !
 source
 "return the classes full source code"
-|code aStream|
+|code aStream tmpFile|
 " this is too slow for big classes ...
 code := String new:1000.
 aStream := WriteStream on:code.
 self fileOutOn:aStream
 "
-aStream := FileStream newFileNamed:'__temp'.
+tmpFile := '__temp' asFilename.
-aStream isNil ifTrue:[
+[
-self notify:'cannot create temporary file.'.
+aStream := tmpFile newReadWriteStream.
+] on:FileStream openErrorSignal do:[:ex|
+self warn:'cannot create temporary file.'.
 ^ nil
 ].
 FileOutErrorSignal handle:[:ex |
 aStream nextPutAll:'"no source available"'.
 ] do:[
 self fileOutOn:aStream.
 ].
 aStream close.
-aStream := FileStream oldFileNamed:'__temp'.
+aStream := tmpFile readStreamOrNil.
 aStream isNil ifTrue:[
-self notify:'oops - cannot reopen temp file'.
+self warn:'oops - cannot reopen temp file'.
 ^ nil
 ].
 code := aStream contents.
 aStream close.
-OperatingSystem removeFile:'__temp'.
+tmpFile remove.
 ^ code
 !
 sourceCodeManager
 "return my source code manager.
 ] ifFalse:[
 newFileName := fileName.
 needRename := false
 ]
 ].
+[
 aStream := newFileName writeStream.
-aStream isNil ifTrue:[
+] on:FileStream openErrorSignal do:[:ex|
 savFilename notNil ifTrue:[
 savFilename delete
 ].
 ^ FileOutErrorSignal
 raiseRequestWith:newFileName
 This is not logged in that change file (should it be ?)."
 |aStream fileName|
 fileName := (Smalltalk fileNameForClass:self name), '.st'.
-aStream := (aDirectoryName asFilename construct:fileName) writeStream.
+[
-aStream isNil ifTrue:[
+aStream := (aDirectoryName asFilename construct:fileName) writeStream.
+] on:FileStream openErrorSignal do:[:ex|
 ^ FileOutErrorSignal
 raiseRequestWith:fileName
 errorString:(' - cannot create file:', fileName)
 ].
 self fileOutOn:aStream.
 |fileName aStream|
 fileName := fileNameString asFilename.
 fileName makeLegalFilename.
-fileName := fileName name.
+[
-aStream := FileStream newFileNamed:fileName.
+aStream := fileName newReadWriteStream.
-aStream isNil ifTrue:[
+] on:FileStream openErrorSignal do:[:ex|
 ^ FileOutErrorSignal
-raiseRequestWith:fileName
+raiseRequestWith:fileName name
-errorString:(' - cannot create file:', fileName)
+errorString:(' - cannot create file:', fileName name)
 ].
 aStream binary.
 self binaryFileOutOn:aStream sourceMode:sourceMode.
 aStream close.
 raiseRequestWith:self
 errorString:' - will not fileOut unloaded class: ', self name
 ].
 fileName := fileNameOrString asFilename.
+[
 aStream := fileName writeStream.
-aStream isNil ifTrue:[
+] on:FileStream openErrorSignal do:[:ex|
 ^ FileOutErrorSignal
 raiseRequestWith:fileName
 errorString:(' - cannot create file: ', fileName name)
 ].
 self fileOutXMLOn:aStream.
 aStream close.
 "
 Class fileOutXMLAs:'test.xml'
+Class fileOutXMLAs:'/blaDoesNotExist/test.xml'
 "
 !
 fileOutXMLDefinitionOn:aStream
 "append an xml expression on aStream, which defines myself."
 currentSourceStream
 "return an open stream on the current source of the receiver"
 |theWriteStream theCurrentSource|
-theWriteStream := String new writeStream.
+theWriteStream := '' writeStream.
 Method flushSourceStreamCache.
 self fileOutOn:theWriteStream withTimeStamp:false.
 theCurrentSource := theWriteStream contents asString.
 theWriteStream close.
 ^ theCurrentSource
 "/ this is still kept in order to find user-private
 "/ classes in her currentDirectory.
 "/
 fileName := Smalltalk getSourceFileName:sourceFile.
 fileName notNil ifTrue:[
-^ fileName asFilename readStream.
+^ fileName asFilename readStreamOrNil.
 ].
 (package := self package) notNil ifTrue:[
 "/ newest sceme ...
 packageDir := package copyReplaceAll:$: with:$/.
 packageDir := Smalltalk getPackageFileName:packageDir.
 packageDir notNil ifTrue:[
 "/ present there ?
 packageDir := packageDir asFilename.
 (fn := packageDir construct:sourceFile) exists ifTrue:[
-^ fn readStream.
+^ fn readStreamOrNil.
 ].
 "/ a source subdirectory ?
 fn := (packageDir construct:'source') construct:sourceFile.
 fn exists ifTrue:[
-^ fn readStream.
+^ fn readStreamOrNil.
 ].
 "/ a zip-file ?
 fn := (packageDir construct:'source.zip').
 fn exists ifTrue:[
 ] ifFalse:[
 package := 'stx/' , package
 ].
 fileName := Smalltalk getSourceFileName:(package , '/' , sourceFile).
 fileName notNil ifTrue:[
-^ fileName asFilename readStream.
+^ fileName asFilename readStreamOrNil.
 ].
 (package startsWith:'stx/') ifTrue:[
 fileName := Smalltalk getSourceFileName:((package copyFrom:5) , '/' , sourceFile).
 fileName notNil ifTrue:[
-^ fileName asFilename readStream.
+^ fileName asFilename readStreamOrNil.
 ]
 ]
 ].
 "/
 dir := info at:#directory ifAbsent:nil.
 dir notNil ifTrue:[
 fn := (module asFilename construct:dir) construct:sourceFile.
 fileName := Smalltalk getSourceFileName:(fn name).
 fileName notNil ifTrue:[
-^ fileName asFilename readStream.
+^ fileName asFilename readStreamOrNil.
 ].
 "/ brand new: look for source/<module>/package.zip
 "/ containing an entry for <filename>
 (classes includes:self) ifTrue:[
 f := h pathName.
 f := f asFilename directory.
 f := f construct:source.
 f exists ifTrue:[
-aStream := f readStream.
+aStream := f readStreamOrNil.
 ].
 ].
 ].
 ]
 ].
 "/
 "/ final chance: try current directory
 "/
 aStream isNil ifTrue:[
-aStream := source asFilename readStream.
+aStream := source asFilename readStreamOrNil.
 ].
 (aStream notNil and:[validated not]) ifTrue:[
 (self validateSourceStream:aStream) ifFalse:[
 (Smalltalk releaseIdentification = 'ST/X_free_demo_vsn') ifTrue:[
 ! !
 !Class class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.422 2003-02-28 18:11:52 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.423 2003-03-02 18:42:46 stefan Exp $'
 ! !

changeset 7089	c4a27118cc2a
parent 7084	e53302e0134b
child 7103	ec84bd722e16