Class.st
changeset 1116 a3c136969f7c
parent 1113 840b03d131d7
child 1179 3e0f32177af4
--- a/Class.st	Fri Mar 22 15:49:40 1996 +0100
+++ b/Class.st	Fri Mar 22 15:50:25 1996 +0100
@@ -1899,11 +1899,11 @@
      Also, since the classes methods need a valid sourcefile, the current 
      sourceFile may not be rewritten."
 
-    |aStream baseName dirName fileName newFileName needRename
+    |aStream baseName dirName fileNameString fileName newFileName needRename
      mySourceFileName sameFile s mySourceFileID anySourceRef|
 
     baseName := (Smalltalk fileNameForClass:self name).
-    fileName := baseName , '.st'.
+    fileNameString := baseName , '.st'.
 
     "
      this test allows a smalltalk to be built without Projects/ChangeSets
@@ -1913,14 +1913,15 @@
     ] ifFalse:[
         dirName := ''
     ].
-    fileName := dirName , fileName.
+    fileNameString := dirName , fileNameString.
+    fileName := fileNameString asFilename.
 
     "
      if file exists, copy the existing to a .sav-file,
      create the new file as XXX.new-file,
      and, if that worked rename afterwards ...
     "
-    (fileName asFilename exists) ifTrue:[
+    (fileName exists) ifTrue:[
         sameFile := false.
 
         "/ check carefully - maybe, my source does not really come from that
@@ -1942,7 +1943,7 @@
             s := self sourceStream.
             s notNil ifTrue:[
                 mySourceFileID := s pathName asFilename info at:#id.
-                sameFile := (fileName asFilename info at:#id) == mySourceFileID.
+                sameFile := (fileName info at:#id) == mySourceFileID.
                 s close.
             ] ifFalse:[
                 classFilename notNil ifTrue:[
@@ -1954,10 +1955,10 @@
                      (from which my methods get their source)
                     "
                     mySourceFileName := Smalltalk getSourceFileName:classFilename. 
-                    sameFile := (fileName = mySourceFileName).
+                    sameFile := (fileNameString = mySourceFileName).
                     sameFile ifFalse:[
                         mySourceFileName notNil ifTrue:[
-                            sameFile := (fileName asFilename info at:#id) == (mySourceFileName asFilename info at:#id)
+                            sameFile := (fileName info at:#id) == (mySourceFileName asFilename info at:#id)
                         ]
                     ].
                 ]
@@ -1966,15 +1967,15 @@
 
         sameFile ifTrue:[
             ^ FileOutErrorSignal 
-                raiseRequestWith:fileName
-                errorString:('may not overwrite sourcefile:', fileName)
+                raiseRequestWith:fileNameString
+                errorString:('may not overwrite sourcefile:', fileNameString)
         ].
 
-        fileName asFilename copyTo:('/tmp/' , baseName , '.sav').
+        fileName copyTo:('/tmp/' , baseName , '.sav').
         newFileName := dirName , baseName , '.new'.
         needRename := true
     ] ifFalse:[
-        newFileName := fileName.
+        newFileName := fileNameString.
         needRename := false
     ].
 
@@ -1993,7 +1994,7 @@
      we have to do a copy ...
     "
     needRename ifTrue:[
-        newFileName asFilename copyTo:fileName.
+        newFileName asFilename copyTo:fileNameString.
         newFileName asFilename delete
     ].
 
@@ -3941,6 +3942,6 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.147 1996-03-21 15:33:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.148 1996-03-22 14:50:25 cg Exp $'
 ! !
 Class initialize!