Project.st
changeset 4080 eee0f8bfc598
parent 4079 84ad7326cc62
child 4089 abcd3430bb9c
--- a/Project.st	Tue Mar 30 20:57:08 1999 +0200
+++ b/Project.st	Tue Mar 30 20:59:01 1999 +0200
@@ -668,21 +668,22 @@
     myDirectory := self directory asFilename.
 
     self classInfo do:[:clsInfo |
-        |clsName clsFileName cls|
+        |clsName clsFileNameString cls clsFilename|
 
         clsName := clsInfo className.
-        clsFileName := clsInfo classFileName.
-        clsFileName isNil ifTrue:[clsFileName := clsName , '.st'].
+        clsFileNameString := clsInfo classFileName.
+        clsFileNameString isNil ifTrue:[clsFileNameString := clsName , '.st'].
 
         clsName isSymbol ifTrue:[
+            clsFilename := myDirectory construct:clsFileNameString.
             cls := Smalltalk at:clsName.
             cls isNil ifTrue:[
                 "/ ok - really not yet loaded.
-                Transcript showCR:'loading ' , (myDirectory construct:clsFileName) pathName , ' ...'.
+                Transcript showCR:'loading ' , clsFilename pathName , ' ...'.
             ] ifFalse:[
-                Transcript showCR:'reloading ' , (myDirectory construct:clsFileName) pathName , ' ...'.
+                Transcript showCR:'reloading ' , clsFilename pathName , ' ...'.
             ].
-            Smalltalk fileIn:(myDirectory construct:clsFileName)
+            Smalltalk fileIn:clsFilename
         ] ifFalse:[
             self halt
         ].
@@ -692,15 +693,16 @@
     "/ this will fix things (i.e. nil superclasses ...)
 
     self classInfo do:[:clsInfo |
-        |clsName clsFileName|
+        |clsName clsFileNameString clsFilename|
 
         clsName := clsInfo className.
-        clsFileName := clsInfo classFileName.
-        clsFileName isNil ifTrue:[clsFileName := clsName , '.st'].
+        clsFileNameString := clsInfo classFileName.
+        clsFileNameString isNil ifTrue:[clsFileNameString := clsName , '.st'].
 
         clsName isSymbol ifTrue:[
-            Transcript showCR:'loading ' , (myDirectory construct:clsFileName) pathName , ' ...'.
-            Smalltalk fileIn:(myDirectory construct:clsFileName)
+            clsFilename := myDirectory construct:clsFileNameString.
+            Transcript showCR:'reloading ' , clsFilename pathName , ' ...'.
+            Smalltalk fileIn:clsFilename
         ] ifFalse:[
             self halt
         ].
@@ -812,7 +814,7 @@
 
     s := aStream.
 
-    s nextPutLine:'; $Header: /cvs/stx/stx/libbasic/Project.st,v 1.74 1999-03-30 18:57:08 cg Exp $'; nextPutLine:';'.
+    s nextPutLine:'; $Header: /cvs/stx/stx/libbasic/Project.st,v 1.75 1999-03-30 18:59:01 cg Exp $'; nextPutLine:';'.
     s nextPutLine:'; Project saved ' , Smalltalk timeStamp; nextPutLine:';'.
     s nextPutLine:'; Be careful when editing - do not corrupt the files syntax.'.
     s nextPutLine:'; (Lines starting with a semicolon are comment lines)'.
@@ -1603,6 +1605,6 @@
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.74 1999-03-30 18:57:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.75 1999-03-30 18:59:01 cg Exp $'
 ! !
 Project initialize!